diff --git a/.github/workflows/automated-ci.yml b/.github/workflows/automated-ci.yml
index bdcffa34e..7030c9587 100644
--- a/.github/workflows/automated-ci.yml
+++ b/.github/workflows/automated-ci.yml
@@ -12,11 +12,13 @@ jobs:
     with:
       pr_ref: ${{ github.event.pull_request.head.sha }}
   rule_tester:
+    if: github.event.action == 'opened'
     uses: ./.github/workflows/rule-tester.yml
     secrets: inherit
     with:
       environment: DEV
   test_rule_editor_preview:
+    if: github.event.action == 'opened'
     needs: rule_tester
     uses: ./.github/workflows/test_rule_editor_preview.yml
     secrets: inherit
diff --git a/resources/schema/Operator.json b/resources/schema/Operator.json
index 459a19607..6abac2bfd 100644
--- a/resources/schema/Operator.json
+++ b/resources/schema/Operator.json
@@ -101,13 +101,6 @@
       "required": ["operator", "value"],
       "type": "object"
     },
-    {
-      "properties": {
-        "operator": { "const": "does_not_use_valid_codelist_terms" }
-      },
-      "required": ["operator", "value", "codelistlevel", "codelistcheck"],
-      "type": "object"
-    },
     {
       "properties": { "operator": { "const": "empty" } },
       "required": ["operator"],
diff --git a/tests/conftest.py b/tests/conftest.py
index b0bed96db..5c6e66f06 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -907,42 +907,6 @@ def dataset_rule_record_in_parent_domain_equal_to() -> dict:
     }
 
 
-@pytest.fixture
-def define_xml_allowed_terms_check_rule() -> dict:
-    return {
-        "core_id": "MockRule",
-        "rule_type": "Define-XML",
-        "standards": [{"Name": "SDTMIG", "Version": "3.3"}],
-        "classes": {"Include": [ALL_KEYWORD]},
-        "domains": {"Include": [ALL_KEYWORD]},
-        "conditions": ConditionCompositeFactory.get_condition_composite(
-            {
-                "all": [
-                    {
-                        "name": "get_dataset",
-                        "operator": "does_not_use_valid_codelist_terms",
-                        "value": {
-                            "target": "define_variable_ccode",
-                            "comparator": "define_variable_allowed_terms",
-                        },
-                    }
-                ]
-            }
-        ),
-        "actions": [
-            {
-                "name": "generate_dataset_error_objects",
-                "params": {"message": "Define specifies invalid codelist terms"},
-            }
-        ],
-        "output_variables": [
-            "define_variable_ccode",
-            "define_variable_name",
-            "define_variable_allowed_terms",
-        ],
-    }
-
-
 @pytest.fixture
 def dataset_rule_inconsistent_enumerated_columns() -> dict:
     """