diff --git a/server/feature_flags.py b/server/feature_flags.py
index daa0c2dc4..45cbf5c57 100644
--- a/server/feature_flags.py
+++ b/server/feature_flags.py
@@ -4,8 +4,5 @@
 def is_enabled_sample_extra_batches_by_counting_group(election: Election):
     return election.organization_id in [
         "b216ad0d-1481-44e4-a2c1-95da40175084",  # Georgia
-        "a67791e3-90a0-4d4e-a5e7-929f82bf4ce6",  # VotingWorks Internal Sandbox
-        "b45800ff-a239-42b3-b285-414cb94d2b6b",  # Ginny's Sandbox
-        "b7b99303-b1ac-4b52-8a02-22c10846cff3",  # Audit Specialist Sandbox
-        "e348fcfd-bd23-4b96-a003-6c3a79abd240",  # Verified Voting Sandbox
+        "test_org_sample_extra_batches_by_counting_group",  # For tests
     ]
diff --git a/server/tests/batch_comparison/test_sample_extra_batches_by_counting_group.py b/server/tests/batch_comparison/test_sample_extra_batches_by_counting_group.py
index 6b755a233..0acc583f7 100644
--- a/server/tests/batch_comparison/test_sample_extra_batches_by_counting_group.py
+++ b/server/tests/batch_comparison/test_sample_extra_batches_by_counting_group.py
@@ -9,11 +9,10 @@
 @pytest.fixture
 def org_id(client: FlaskClient, request) -> str:  # pylint: disable=unused-argument
     # Enable the feature flag
-    org_id = "a67791e3-90a0-4d4e-a5e7-929f82bf4ce6"  # VotingWorks Internal Sandbox
-    # id=str(uuid.uuid4()),
+    org_id = "test_org_sample_extra_batches_by_counting_group"
     org = Organization.query.get(org_id)
     if not org:
-        org = Organization(id=org_id, name="Test Org Sample Extra Batches",)
+        org = Organization(id=org_id, name="Test Org Sample Extra Batches")
         db_session.add(org)
         add_admin_to_org(org_id, DEFAULT_AA_EMAIL)
         db_session.commit()