diff --git a/mk/target.mk b/mk/target.mk
index 45351798711..609d9e4cbc5 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -31,7 +31,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB): \
 		$$(CORELIB_CRATE) $$(CORELIB_INPUTS) \
 		$$(TSREQ$(1)_T_$(2)_H_$(3))
 	@$$(call E, compile_and_link: $$@)
-	$$(STAGE$(1)_T_$(2)_H_$(3)) --no-core -o $$@ $$< && touch $$@
+	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
 
 $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB): \
 		$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
diff --git a/mk/tests.mk b/mk/tests.mk
index 4bc72c35fd2..975041d4f9c 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -196,7 +196,7 @@ $(3)/test/coretest.stage$(1)-$(2)$$(X):			\
 		$$(CORELIB_CRATE) $$(CORELIB_INPUTS)	\
         $$(SREQ$(1)_T_$(2)_H_$(3))
 	@$$(call E, compile_and_link: $$@)
-	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test --no-core
+	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
 
 check-stage$(1)-T-$(2)-H-$(3)-core-dummy:			\
 		$(3)/test/coretest.stage$(1)-$(2)$$(X)
diff --git a/src/comp/driver/driver.rs b/src/comp/driver/driver.rs
index 1b57c627455..00d5a76929e 100644
--- a/src/comp/driver/driver.rs
+++ b/src/comp/driver/driver.rs
@@ -494,9 +494,7 @@ fn opts() -> [getopts::opt] {
          optmulti("cfg"), optflag("test"),
          optflag("lib"), optflag("bin"), optflag("static"), optflag("gc"),
          optflag("no-asm-comments"),
-         optflag("warn-unused-imports"),
-         // FIXME: Transitional. Please remove
-         optflag("no-core")];
+         optflag("warn-unused-imports")];
 }
 
 type output_filenames = @{out_filename: str, obj_filename:str};