diff --git a/jstests/index12.js b/jstests/index12.js
deleted file mode 100644
index 7eb796b46ee..00000000000
--- a/jstests/index12.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Test renaming a collection during a background index build.  SERVER-4820
-
-if ( 0 ) { // SERVER-4820
-c = db.jstests_index12;
-c.drop();
-
-s = startParallelShell (
-' for( i = 0; i < 100; ++i ) {' +
-'    db.getSisterDB( "admin" ).runCommand( {renameCollection:"test.jstests_index12", to:"test.jstests_index12b"} );' +
-'    db.jstests_index12b.drop();' +
-'    sleep( 30 );' +
-' }'
-);
-
-for( i = 0; i < 10; ++i ) {
-    for( j = 0; j < 1000; ++j ) {
-        c.save( {a:j} );
-    }
-    c.ensureIndex( {i:1}, {background:true} );
-    assert( !db.getLastError() );
-}
-
-s();
-}
\ No newline at end of file
diff --git a/jstests/fsync2.js b/jstests/slowNightly/fsync2.js
similarity index 89%
rename from jstests/fsync2.js
rename to jstests/slowNightly/fsync2.js
index e3be9bfcd76..bdf956f30f2 100644
--- a/jstests/fsync2.js
+++ b/jstests/slowNightly/fsync2.js
@@ -13,7 +13,9 @@ if ( db.getSisterDB("local").slaves.count() > 0 ) {
 
 function doTest() {
     db.fsync2.drop();
-    
+    // Make write ops asynchronous so the test won't hang when in fsync lock mode.
+    db.getMongo().forceWriteMode('legacy');
+
     db.fsync2.save( {x:1} );
     
     d = db.getSisterDB( "admin" );