diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java
index 51e7598a..4a764bcc 100755
--- a/src/main/java/baritone/Baritone.java
+++ b/src/main/java/baritone/Baritone.java
@@ -109,7 +109,7 @@ public enum Baritone {
                     PathingBehavior.INSTANCE
             );
         }
-        if (BaritoneAutoTest.ENABLE_AUTO_TEST && "true".equals(System.getenv("BARITONE_AUTO_TEST"))) {
+        if (BaritoneAutoTest.ENABLE_AUTO_TEST) {
             registerEventListener(BaritoneAutoTest.INSTANCE);
         }
         this.dir = new File(Minecraft.getMinecraft().gameDir, "baritone");
diff --git a/src/main/java/baritone/utils/BaritoneAutoTest.java b/src/main/java/baritone/utils/BaritoneAutoTest.java
index 071b1a90..faad6153 100644
--- a/src/main/java/baritone/utils/BaritoneAutoTest.java
+++ b/src/main/java/baritone/utils/BaritoneAutoTest.java
@@ -37,7 +37,7 @@ public class BaritoneAutoTest implements AbstractGameEventListener, Helper {
 
     private BaritoneAutoTest() {}
 
-    public static final boolean ENABLE_AUTO_TEST = true;
+    public static final boolean ENABLE_AUTO_TEST = "true".equals(System.getenv("BARITONE_AUTO_TEST"));
     private static final long TEST_SEED = -928872506371745L;
     private static final BlockPos STARTING_POSITION = new BlockPos(0, 65, 0);
     private static final Goal GOAL = new GoalBlock(69, 121, 420);
@@ -47,7 +47,7 @@ public class BaritoneAutoTest implements AbstractGameEventListener, Helper {
      * Called right after the {@link GameSettings} object is created in the {@link Minecraft} instance.
      */
     public void onPreInit() {
-        if (!BaritoneAutoTest.ENABLE_AUTO_TEST || !"true".equals(System.getenv("BARITONE_AUTO_TEST"))) {
+        if (!BaritoneAutoTest.ENABLE_AUTO_TEST) {
             return;
         }
         System.out.println("Optimizing Game Settings");