diff --git a/configure b/configure
index 94f00d1c8843b8e26c4f59b07014ac04a319d089..f14c92de399c92c9ea9ba4aac29cd5262a2d4e31 100755
--- a/configure
+++ b/configure
@@ -182,8 +182,7 @@ for i in \
     dl stage0 stage1 stage2 stage3 \
     stage0/lib stage1/lib stage2/lib stage3/lib \
     test/run-pass test/run-fail test/compile-fail \
-    test/bench/99-bottles test/bench/shootout \
-    test/stdtest
+    test/bench/99-bottles test/bench/shootout
 do
     make_dir $i
 done
diff --git a/mk/tests.mk b/mk/tests.mk
index ca93e86ab6a5688c21b8ac20d4ea8869b116e10f..5e468b4bcb9c8879427879c210ec1de017e2f00c 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -342,26 +342,27 @@ test/compile-fail/%.stage2.out.tmp: test/compile-fail/%.rc $(SREQ2)
 STDTEST_CRATE := $(S)src/test/stdtest/stdtest.rc
 STDTEST_INPUTS := $(wildcard $(S)src/test/stdtest/*rs)
 
-test/stdtest/stdtest.stage1$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ1)
+test/stdtest.stage1$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ1)
 	@$(call E, compile_and_link: $@)
 	$(STAGE1) -o $@ $< --test
 
-test/stdtest/stdtest.stage2$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ2)
+test/stdtest.stage2$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ2)
 	@$(call E, compile_and_link: $@)
 	$(STAGE2) -o $@ $< --test
 
-test/stdtest/stdtest.stage3$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ3)
+test/stdtest.stage3$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ3)
 	@$(call E, compile_and_link: $@)
 	$(STAGE3) -o $@ $< --test
 
-check-stage1-std:test/stdtest/stdtest.stage1$(X)
+check-stage1-std:test/stdtest.stage1$(X)
 	@$(call E, run: $<)
 	$(Q)$(call CFG_RUN_TARG,stage1,stage1, $<)
 
-check-stage2-std:test/stdtest/stdtest.stage2$(X)
+check-stage2-std:test/stdtest.stage2$(X)
 	@$(call E, run: $<)
 	$(Q)$(call CFG_RUN_TARG,stage2,stage2, $<)
 
-check-stage3-std:test/stdtest/stdtest.stage3$(X)
+check-stage3-std:test/stdtest.stage3$(X)
 	@$(call E, run: $<)
 	$(Q)$(call CFG_RUN_TARG,stage3,stage3, $<)
+