diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index ccbafa0f159..a86a94547f7 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -187,7 +187,6 @@ fn make_test_closure(cx: cx, testfile: str) -> test::test_fn {
 fn run_test_task(config: common::config,
                  procsrv_chan: procsrv::reqchan,
                  testfile: str) {
-    test::configure_test_task();
 
     let procsrv = procsrv::from_chan(procsrv_chan);
     let cx = {config: config, procsrv: procsrv};
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index 88601ebb19e..7fc63c015ee 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -227,7 +227,11 @@ fn run_tests(opts: test_opts, tests: [test_desc],
     }
 }
 
-fn get_concurrency() -> uint { rustrt::sched_threads() }
+fn get_concurrency() -> uint {
+    let threads = rustrt::sched_threads();
+    if threads == 1u { 1u }
+    else { threads * 4u }
+}
 
 fn filter_tests(opts: test_opts,
                 tests: [test_desc]) -> [test_desc] {