diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
index 1f3df1ff6f2d..2965c763ccc4 100644
--- a/src/librustc_driver/driver.rs
+++ b/src/librustc_driver/driver.rs
@@ -743,7 +743,11 @@ pub fn phase_2_configure_and_expand(sess: &Session,
     })?;
 
     krate = time(time_passes, "maybe building test harness", || {
-        syntax::test::modify_for_testing(&sess.parse_sess, &sess.opts.cfg, krate, sess.diagnostic())
+        syntax::test::modify_for_testing(&sess.parse_sess,
+                                         sess.opts.test,
+                                         &sess.opts.cfg,
+                                         krate,
+                                         sess.diagnostic())
     });
 
     krate = time(time_passes,
diff --git a/src/libsyntax/test.rs b/src/libsyntax/test.rs
index 8eeb61e0de46..56485433101f 100644
--- a/src/libsyntax/test.rs
+++ b/src/libsyntax/test.rs
@@ -68,14 +68,10 @@ struct TestCtxt<'a> {
 // Traverse the crate, collecting all the test functions, eliding any
 // existing main functions, and synthesizing a main test harness
 pub fn modify_for_testing(sess: &ParseSess,
+                          should_test: bool,
                           cfg: &ast::CrateConfig,
                           krate: ast::Crate,
                           span_diagnostic: &errors::Handler) -> ast::Crate {
-    // We generate the test harness when building in the 'test'
-    // configuration, either with the '--test' or '--cfg test'
-    // command line options.
-    let should_test = attr::contains_name(&krate.config, "test");
-
     // Check for #[reexport_test_harness_main = "some_name"] which
     // creates a `use some_name = __test::main;`. This needs to be
     // unconditional, so that the attribute is still marked as used in
diff --git a/src/test/run-pass/test-vs-cfg-test.rs b/src/test/run-pass/test-vs-cfg-test.rs
new file mode 100644
index 000000000000..708fde598886
--- /dev/null
+++ b/src/test/run-pass/test-vs-cfg-test.rs
@@ -0,0 +1,18 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags: --cfg test
+
+// Make sure `--cfg test` does not inject test harness
+
+#[test]
+fn test() { panic!(); }
+
+fn main() {}