diff --git a/posix.mak b/posix.mak
index e2f1caad77e..9b91d1ec60c 100644
--- a/posix.mak
+++ b/posix.mak
@@ -702,20 +702,12 @@ $(ROOT)/betterctests/betterc_module_tests: test/betterc_module_tests.d $(addsuff
 ################################################################################
 
 .PHONY : auto-tester-build
-ifneq (,$(findstring Darwin_64_32, $(PWD)))
 auto-tester-build:
-	echo "Darwin_64_32_disabled"
-else
-auto-tester-build: all checkwhitespace
-endif
+	echo "Auto-Tester has been disabled"
 
 .PHONY : auto-tester-test
-ifneq (,$(findstring Darwin_64_32, $(PWD)))
 auto-tester-test:
-	echo "Darwin_64_32_disabled"
-else
-auto-tester-test: unittest
-endif
+	echo "Auto-Tester has been disabled"
 
 .PHONY: buildkite-test
 buildkite-test: unittest betterc
diff --git a/win32.mak b/win32.mak
index 9f86baa6149..b29fad7589e 100644
--- a/win32.mak
+++ b/win32.mak
@@ -568,7 +568,7 @@ install: phobos.zip
 	unzip -o phobos.zip -d $(DIR)\src\phobos
 
 auto-tester-build:
-	echo "Windows builds have been disabled on auto-tester"
+	echo "Auto-Tester has been disabled"
 
 auto-tester-test:
-	echo "Windows builds have been disabled on auto-tester"
+	echo "Auto-Tester has been disabled"
diff --git a/win64.mak b/win64.mak
index 39bf96940e2..f094ab12170 100644
--- a/win64.mak
+++ b/win64.mak
@@ -507,12 +507,10 @@ install: phobos.zip $(LIB)
 	unzip -o phobos.zip -d $(DIR)\src\phobos
 
 auto-tester-build:
-	echo "Windows builds have been disabled on auto-tester"
+	echo "Auto-Tester has been disabled"
 
 JOBS=$(NUMBER_OF_PROCESSORS)
 GMAKE=gmake
 
 auto-tester-test:
-	echo "Windows builds have been disabled on auto-tester"
-	#"$(GMAKE)" -j$(JOBS) -f posix.mak unittest BUILD=release DMD="$(DMD)" OS=win$(MODEL) \
-	#CUSTOM_DRUNTIME=1 PIC=0 MODEL=$(MODEL) DRUNTIME=$(DRUNTIMELIB) CC=$(CC)
+	echo "Auto-Tester has been disabled"