diff --git a/configure b/configure
index f14c92de399..94f00d1c884 100755
--- a/configure
+++ b/configure
@@ -182,7 +182,8 @@ 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/bench/99-bottles test/bench/shootout \
+    test/stdtest
 do
     make_dir $i
 done
diff --git a/mk/tests.mk b/mk/tests.mk
index 2511c3ceccd..d7205c3fc53 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -337,3 +337,10 @@ test/compile-fail/%.stage2.out.tmp: test/compile-fail/%.rc $(SREQ2)
 	$(STAGE2) -c -o $(@:.o=$(X)) $< >$@ 2>&1; test $$? -ne 0
 	$(Q)grep --text --quiet \
       "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@
+
+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)
+	@$(call E, compile_and_link: $@)
+	$(STAGE1) -o $@ $< --test
diff --git a/src/test/stdtest/stdtest.rc b/src/test/stdtest/stdtest.rc
new file mode 100644
index 00000000000..07dd277d18c
--- /dev/null
+++ b/src/test/stdtest/stdtest.rc
@@ -0,0 +1,10 @@
+use std;
+
+// Local Variables:
+// mode: rust
+// fill-column: 78;
+// indent-tabs-mode: nil
+// c-basic-offset: 4
+// buffer-file-coding-system: utf-8-unix
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// End: