diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 7127c868..80ae62fc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -7,6 +7,8 @@ services:
       - "8443:8443"
     volumes:
       - ../docker/feature-flags.json:/etc/feature-flag-periodic.d/feature-flags.json
+    environment:
+      - FLAG_ACCOUNT_CHANGE_FEEDS=true
   test:
     image: fauna-python-test:latest
     build:
diff --git a/docker/feature-flags.json b/docker/feature-flags.json
index 739da189..f8a84280 100644
--- a/docker/feature-flags.json
+++ b/docker/feature-flags.json
@@ -5,25 +5,7 @@
       "property_name": "cluster_name",
       "property_value": "fauna",
       "flags": {
-        "fql2_schema": true,
-        "fqlx_typecheck_default": true,
-        "persisted_fields": true,
-        "changes_by_collection_index": true,
-        "fql2_streams": true,
-        "change_feeds": true
       }
     },
-    {
-      "property_name": "account_id",
-      "property_value": 0,
-      "flags": {
-        "fql2_schema": true,
-        "fqlx_typecheck_default": true,
-        "persisted_fields": true,
-        "changes_by_collection_index": true,
-        "fql2_streams": true,
-        "change_feeds": true
-      }
-    }
   ]
 }
diff --git a/tests/docker-compose-tests.yml b/tests/docker-compose-tests.yml
index 9a958c35..f8434d26 100644
--- a/tests/docker-compose-tests.yml
+++ b/tests/docker-compose-tests.yml
@@ -6,6 +6,10 @@ services:
     container_name: faunadb
     ports:
       - "8443:8443"
+    volumes:
+      - ../docker/feature-flags.json:/etc/feature-flag-periodic.d/feature-flags.json
+    environment:
+      - FLAG_ACCOUNT_CHANGE_FEEDS=true
     healthcheck:
       test: ["CMD", "curl", "http://faunadb:8443/ping"]
       interval: 1s