diff --git a/test/Makefile b/test/Makefile
index 7df67851faf9..6abef917eb53 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -198,5 +198,6 @@ start_fail_compilation_tests: $(RESULTS_DIR)/.created $(RESULTS_DIR)/d_do_test
 $(RESULTS_DIR)/d_do_test: d_do_test.d $(RESULTS_DIR)/.created
 	@echo "Building d_do_test tool"
 	@echo "OS: $(OS)"
+	$(QUIET)$(DMD) -m$(MODEL) -unittest -run d_do_test.d -unittest
 	$(QUIET)$(DMD) -m$(MODEL) -od$(RESULTS_DIR) -of$(RESULTS_DIR)$(DSEP)d_do_test d_do_test.d
 
diff --git a/test/d_do_test.d b/test/d_do_test.d
index 8a69006b3749..9a41969d6009 100755
--- a/test/d_do_test.d
+++ b/test/d_do_test.d
@@ -137,7 +137,7 @@ void gatherTestParameters(ref TestArgs testArgs, string input_dir, string input_
     findTestParameter(file, "REQUIRED_ARGS", testArgs.requiredArgs);
     if(envData.required_args.length)
         testArgs.requiredArgs ~= " " ~ envData.required_args;
-    
+
     if (! findTestParameter(file, "PERMUTE_ARGS", testArgs.permuteArgs))
     {
         if (testArgs.mode != TestMode.FAIL_COMPILE)
@@ -284,6 +284,8 @@ int main(string[] args)
 {
     if (args.length != 4)
     {
+        if (args.length == 2 && args[1] == "-unittest")
+            return 0;
         usage();
         return 1;
     }
@@ -407,8 +409,8 @@ int main(string[] args)
             if (testArgs.mode == TestMode.RUN)
             {
                 toCleanup ~= test_app_dmd;
-                version(Windows) 
-                    if(envData.model == "64") 
+                version(Windows)
+                    if (envData.model == "64")
                     {
                         toCleanup ~= test_app_dmd_base ~ to!string(i) ~ ".ilk";
                         toCleanup ~= test_app_dmd_base ~ to!string(i) ~ ".pdb";