diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index 734106b7..e3fb5e0f 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -34,13 +34,17 @@ const EXAMPLES_DIR: &str = "tests/examples";
 fn bat_raw_command_with_config() -> Command {
     let mut cmd = Command::cargo_bin("bat").unwrap();
     cmd.current_dir("tests/examples");
-    cmd.env_remove("PAGER");
-    cmd.env_remove("BAT_PAGER");
-    cmd.env_remove("BAT_CONFIG_PATH");
-    cmd.env_remove("BAT_STYLE");
-    cmd.env_remove("BAT_THEME");
-    cmd.env_remove("BAT_TABS");
+    cmd.env_remove("BAT_CACHE_PATH");
     cmd.env_remove("BAT_CONFIG_DIR");
+    cmd.env_remove("BAT_CONFIG_PATH");
+    cmd.env_remove("BAT_OPTS");
+    cmd.env_remove("BAT_PAGER");
+    cmd.env_remove("BAT_STYLE");
+    cmd.env_remove("BAT_TABS");
+    cmd.env_remove("BAT_THEME");
+    cmd.env_remove("COLORTERM");
+    cmd.env_remove("NO_COLOR");
+    cmd.env_remove("PAGER");
     cmd
 }
 
diff --git a/tests/syntax-tests/create_highlighted_versions.py b/tests/syntax-tests/create_highlighted_versions.py
index 73feeafd..a5acdb6e 100755
--- a/tests/syntax-tests/create_highlighted_versions.py
+++ b/tests/syntax-tests/create_highlighted_versions.py
@@ -47,12 +47,16 @@ def create_highlighted_versions(output_basepath):
     ):
         try:
             env = os.environ.copy()
-            env.pop("PAGER", None)
-            env.pop("BAT_PAGER", None)
+            env.pop("BAT_CACHE_PATH", None)
+            env.pop("BAT_CONFIG_DIR", None)
             env.pop("BAT_CONFIG_PATH", None)
+            env.pop("BAT_OPTS", None)
+            env.pop("BAT_PAGER", None)
             env.pop("BAT_STYLE", None)
-            env.pop("BAT_THEME", None)
             env.pop("BAT_TABS", None)
+            env.pop("BAT_THEME", None)
+            env.pop("NO_COLOR", None)
+            env.pop("PAGER", None)
             env["COLORTERM"] = "truecolor"  # make sure to output 24bit colors
 
             source_dirname = path.basename(path.dirname(source))