SERVER-35715 Remove nopreallocj and smallfiles options from tests

65 files changed, 45 insertions, 134 deletions

diff --git a/buildscripts/resmokeconfig/suites/aggregation_mongos_passthrough.yml b/buildscripts/resmokeconfig/suites/aggregation_mongos_passthrough.yml
index 700a7586c45..14151b4ea4f 100644
--- a/buildscripts/resmokeconfig/suites/aggregation_mongos_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/aggregation_mongos_passthrough.yml
@@ -36,7 +36,6 @@ executor:
       set_parameters:
         enableTestCommands: 1
     mongod_options:
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         numInitialSyncAttempts: 1
diff --git a/buildscripts/resmokeconfig/suites/aggregation_one_shard_sharded_collections.yml b/buildscripts/resmokeconfig/suites/aggregation_one_shard_sharded_collections.yml
index 5a3418ff8b4..3f31669bd9f 100644
--- a/buildscripts/resmokeconfig/suites/aggregation_one_shard_sharded_collections.yml
+++ b/buildscripts/resmokeconfig/suites/aggregation_one_shard_sharded_collections.yml
@@ -46,7 +46,6 @@ executor:
       set_parameters:
         enableTestCommands: 1
     mongod_options:
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         numInitialSyncAttempts: 1
diff --git a/buildscripts/resmokeconfig/suites/aggregation_sharded_collections_passthrough.yml b/buildscripts/resmokeconfig/suites/aggregation_sharded_collections_passthrough.yml
index 782c5c57d78..83817f9039e 100644
--- a/buildscripts/resmokeconfig/suites/aggregation_sharded_collections_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/aggregation_sharded_collections_passthrough.yml
@@ -52,7 +52,6 @@ executor:
       set_parameters:
         enableTestCommands: 1
     mongod_options:
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         numInitialSyncAttempts: 1
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
index 67378ba9bde..7dd0669278c 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
@@ -147,7 +147,6 @@ executor:
             asio: 2
           tracking: 0
     mongod_options:
-      nopreallocj: ''
       enableMajorityReadConcern: ''
       set_parameters:
         enableTestCommands: 1
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
index 469ef33e92a..901bae17d77 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
@@ -220,7 +220,6 @@ executor:
             asio: 2
           tracking: 0
     mongod_options:
-      nopreallocj: ''
       enableMajorityReadConcern: ''
       auth: ''
       keyFile: *keyFile
diff --git a/buildscripts/resmokeconfig/suites/change_streams_mongos_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_mongos_passthrough.yml
index 4be978a6264..742ff569647 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_mongos_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_mongos_passthrough.yml
@@ -50,7 +50,6 @@ executor:
         enableTestCommands: 1
     mongod_options:
       bind_ip_all: ''
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         numInitialSyncAttempts: 1
diff --git a/buildscripts/resmokeconfig/suites/change_streams_mongos_sessions_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_mongos_sessions_passthrough.yml
index 29531e940e9..78d8804b2a6 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_mongos_sessions_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_mongos_sessions_passthrough.yml
@@ -53,7 +53,6 @@ executor:
         enableTestCommands: 1
     mongod_options:
       bind_ip_all: ''
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         numInitialSyncAttempts: 1
diff --git a/buildscripts/resmokeconfig/suites/change_streams_secondary_reads.yml b/buildscripts/resmokeconfig/suites/change_streams_secondary_reads.yml
index 96b9263f17c..741cb9941a3 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_secondary_reads.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_secondary_reads.yml
@@ -64,7 +64,6 @@ executor:
             asio: 2
           tracking: 0
     mongod_options:
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         logComponentVerbosity:
diff --git a/buildscripts/resmokeconfig/suites/change_streams_sharded_collections_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_sharded_collections_passthrough.yml
index cab7e64392c..870733bee73 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_sharded_collections_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_sharded_collections_passthrough.yml
@@ -57,7 +57,6 @@ executor:
         enableTestCommands: 1
     mongod_options:
       bind_ip_all: ''
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         writePeriodicNoops: 1
diff --git a/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_mongos_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_mongos_passthrough.yml
index 8997157ab46..61563e20081 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_mongos_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_mongos_passthrough.yml
@@ -55,7 +55,6 @@ executor:
         enableTestCommands: 1
     mongod_options:
       bind_ip_all: ''
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         numInitialSyncAttempts: 1
diff --git a/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_secondary_reads_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_secondary_reads_passthrough.yml
index a30e2128ae1..05c21082896 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_secondary_reads_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_secondary_reads_passthrough.yml
@@ -67,7 +67,6 @@ executor:
             asio: 2
           tracking: 0
     mongod_options:
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         logComponentVerbosity:
diff --git a/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_sharded_collections_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_sharded_collections_passthrough.yml
index e46b04ee0fd..52bdb767888 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_sharded_collections_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_sharded_collections_passthrough.yml
@@ -56,7 +56,6 @@ executor:
         enableTestCommands: 1
     mongod_options:
       bind_ip_all: ''
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         writePeriodicNoops: 1
diff --git a/buildscripts/resmokeconfig/suites/change_streams_whole_db_mongos_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_whole_db_mongos_passthrough.yml
index 2a8905fe3b9..fb777e33aa8 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_whole_db_mongos_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_whole_db_mongos_passthrough.yml
@@ -59,7 +59,6 @@ executor:
         enableTestCommands: 1
     mongod_options:
       bind_ip_all: ''
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         numInitialSyncAttempts: 1
diff --git a/buildscripts/resmokeconfig/suites/change_streams_whole_db_secondary_reads_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_whole_db_secondary_reads_passthrough.yml
index 2284830db48..b6dce87e1a7 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_whole_db_secondary_reads_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_whole_db_secondary_reads_passthrough.yml
@@ -68,7 +68,6 @@ executor:
             asio: 2
           tracking: 0
     mongod_options:
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         logComponentVerbosity:
diff --git a/buildscripts/resmokeconfig/suites/change_streams_whole_db_sharded_collections_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_whole_db_sharded_collections_passthrough.yml
index bc184d9dcfb..044ff3f9c39 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_whole_db_sharded_collections_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_whole_db_sharded_collections_passthrough.yml
@@ -59,7 +59,6 @@ executor:
         enableTestCommands: 1
     mongod_options:
       bind_ip_all: ''
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         writePeriodicNoops: 1
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz.yml b/buildscripts/resmokeconfig/suites/jstestfuzz.yml
index 8e0bf7467a7..c8e3b21b7e7 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz.yml
@@ -25,5 +25,4 @@ executor:
       set_parameters:
         disableLogicalSessionCacheRefresh: false
         enableTestCommands: 1
-      smallfiles: ''
       verbose: ''
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_interrupt.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_interrupt.yml
index 746bd09d26d..f1e89c054b5 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz_interrupt.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz_interrupt.yml
@@ -29,5 +29,4 @@ executor:
       set_parameters:
         disableLogicalSessionCacheRefresh: false
         enableTestCommands: 1
-      smallfiles: ''
       verbose: ''
diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
index 78ccd3d0e26..89af35a7fdf 100644
--- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
@@ -183,7 +183,6 @@ executor:
             verbosity: 1
             asio: 2
     mongod_options:
-      nopreallocj: ''
       enableMajorityReadConcern: ''
       set_parameters:
         enableTestCommands: 1
diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
index 57ff3c526a8..1262fe16071 100644
--- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
@@ -131,7 +131,6 @@ executor:
       set_parameters:
         enableTestCommands: 1
     mongod_options:
-      nopreallocj: ''
       set_parameters:
         enableTestCommands: 1
         numInitialSyncAttempts: 1
diff --git a/buildscripts/resmokelib/config.py b/buildscripts/resmokelib/config.py
index 66753c389db..7206ff2b292 100644
--- a/buildscripts/resmokelib/config.py
+++ b/buildscripts/resmokelib/config.py
@@ -58,7 +58,6 @@ DEFAULTS = {
     "no_journal": False,
     "num_clients_per_fixture": 1,
     "perf_report_file": None,
-    "prealloc_journal": None,  # Default is set on the commandline.
     "repeat": 1,
     "report_failure_status": "fail",
     "report_file": None,
@@ -281,10 +280,6 @@ MONGOS_SET_PARAMETERS = None
 # enabled.
 NO_JOURNAL = None
 
-# If true, then all mongod's started by resmoke.py and by the mongo shell will not preallocate
-# journal files.
-NO_PREALLOC_JOURNAL = None
-
 # If set, then each fixture runs tests with the specified number of clients.
 NUM_CLIENTS_PER_FIXTURE = None
 
diff --git a/buildscripts/resmokelib/core/programs.py b/buildscripts/resmokelib/core/programs.py
index 1e8a0cff44c..0b34fed8d6c 100644
--- a/buildscripts/resmokelib/core/programs.py
+++ b/buildscripts/resmokelib/core/programs.py
@@ -67,7 +67,6 @@ def mongod_program(  # pylint: disable=too-many-branches
 
     shortcut_opts = {
         "nojournal": config.NO_JOURNAL,
-        "nopreallocj": config.NO_PREALLOC_JOURNAL,
         "serviceExecutor": config.SERVICE_EXECUTOR,
         "storageEngine": config.STORAGE_ENGINE,
         "transportLayer": config.TRANSPORT_LAYER,
@@ -82,7 +81,7 @@ def mongod_program(  # pylint: disable=too-many-branches
         shortcut_opts["wiredTigerCacheSizeGB"] = config.STORAGE_ENGINE_CACHE_SIZE
 
     # These options are just flags, so they should not take a value.
-    opts_without_vals = ("nojournal", "nopreallocj")
+    opts_without_vals = ("nojournal", )
 
     # Have the --nojournal command line argument to resmoke.py unset the journal option.
     if shortcut_opts["nojournal"] and "journal" in kwargs:
@@ -162,7 +161,6 @@ def mongo_shell_program(  # pylint: disable=too-many-branches,too-many-locals,to
 
     shortcut_opts = {
         "noJournal": (config.NO_JOURNAL, False),
-        "noJournalPrealloc": (config.NO_PREALLOC_JOURNAL, False),
         "serviceExecutor": (config.SERVICE_EXECUTOR, ""),
         "storageEngine": (config.STORAGE_ENGINE, ""),
         "storageEngineCacheSizeGB": (config.STORAGE_ENGINE_CACHE_SIZE, ""),
diff --git a/buildscripts/resmokelib/parser.py b/buildscripts/resmokelib/parser.py
index 4798e9525dc..bcdd0b917b4 100644
--- a/buildscripts/resmokelib/parser.py
+++ b/buildscripts/resmokelib/parser.py
@@ -124,20 +124,12 @@ def _make_parser():  # pylint: disable=too-many-statements
     parser.add_option("--nojournal", action="store_true", dest="no_journal",
                       help="Disables journaling for all mongod's.")
 
-    parser.add_option("--nopreallocj", action="store_const", const="off", dest="prealloc_journal",
-                      help="Disables preallocation of journal files for all mongod processes.")
-
     parser.add_option("--numClientsPerFixture", type="int", dest="num_clients_per_fixture",
                       help="Number of clients running tests per fixture.")
 
     parser.add_option("--perfReportFile", dest="perf_report_file", metavar="PERF_REPORT",
                       help="Writes a JSON file with performance test results.")
 
-    parser.add_option("--preallocJournal", type="choice", action="store", dest="prealloc_journal",
-                      choices=("on", "off"), metavar="ON|OFF",
-                      help=("Enables or disables preallocation of journal files for all mongod"
-                            " processes. Defaults to %default."))
-
     parser.add_option("--shellConnString", dest="shell_conn_string", metavar="CONN_STRING",
                       help="Overrides the default fixture and connect to an existing MongoDB"
                       " cluster instead. This is useful for connecting to a MongoDB"
@@ -293,8 +285,7 @@ def _make_parser():  # pylint: disable=too-many-statements
                                  metavar="BENCHMARK_REPETITIONS", help=benchmark_repetitions_help)
 
     parser.set_defaults(logger_file="console", dry_run="off", find_suites=False, list_suites=False,
-                        suite_files="with_server", prealloc_journal="off", shuffle="auto",
-                        stagger_jobs="off")
+                        suite_files="with_server", shuffle="auto", stagger_jobs="off")
     return parser
 
 
@@ -373,7 +364,6 @@ def _update_config_vars(values):  # pylint: disable=too-many-statements
     _config.MONGOS_EXECUTABLE = _expand_user(config.pop("mongos_executable"))
     _config.MONGOS_SET_PARAMETERS = config.pop("mongos_set_parameters")
     _config.NO_JOURNAL = config.pop("no_journal")
-    _config.NO_PREALLOC_JOURNAL = config.pop("prealloc_journal") == "off"
     _config.NUM_CLIENTS_PER_FIXTURE = config.pop("num_clients_per_fixture")
     _config.PERF_REPORT_FILE = config.pop("perf_report_file")
     _config.RANDOM_SEED = config.pop("seed")
diff --git a/jstests/auth/access_control_with_unreachable_configs.js b/jstests/auth/access_control_with_unreachable_configs.js
index edb85c5bb76..a75d583e6f0 100644
--- a/jstests/auth/access_control_with_unreachable_configs.js
+++ b/jstests/auth/access_control_with_unreachable_configs.js
@@ -4,8 +4,6 @@
 // there are.
 // @tags: [requires_sharding]
 
-var dopts = {smallfiles: "", nopreallocj: ""};
-
 // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
 var st = new ShardingTest({
     shards: 1,
@@ -13,12 +11,7 @@ var st = new ShardingTest({
     config: 1,
     keyFile: 'jstests/libs/key1',
     useHostname: false,  // Needed when relying on the localhost exception
-    other: {
-        shardOptions: dopts,
-        configOptions: dopts,
-        mongosOptions: {verbose: 1},
-        shardAsReplicaSet: false
-    }
+    other: {mongosOptions: {verbose: 1}, shardAsReplicaSet: false}
 });
 var mongos = st.s;
 var config = st.config0;
diff --git a/jstests/auth/auth2.js b/jstests/auth/auth2.js
index 406dcd81adf..baf57753cef 100644
--- a/jstests/auth/auth2.js
+++ b/jstests/auth/auth2.js
@@ -1,6 +1,6 @@
 // test read/write permissions
 
-m = MongoRunner.runMongod({auth: "", bind_ip: "127.0.0.1", smallfiles: ""});
+m = MongoRunner.runMongod({auth: "", bind_ip: "127.0.0.1"});
 db = m.getDB("admin");
 
 // These statements throw because the localhost exception does not allow
diff --git a/jstests/auth/auth_helpers.js b/jstests/auth/auth_helpers.js
index 47fa0c8c39e..0e944560e0b 100644
--- a/jstests/auth/auth_helpers.js
+++ b/jstests/auth/auth_helpers.js
@@ -3,7 +3,7 @@
 (function() {
     'use strict';
 
-    const conn = MongoRunner.runMongod({smallfiles: ""});
+    const conn = MongoRunner.runMongod();
     const admin = conn.getDB('admin');
 
     admin.createUser({user: 'andy', pwd: 'a', roles: jsTest.adminUserRoles});
diff --git a/jstests/auth/db_multiple_login.js b/jstests/auth/db_multiple_login.js
index d85fa22a2cc..45675c10865 100644
--- a/jstests/auth/db_multiple_login.js
+++ b/jstests/auth/db_multiple_login.js
@@ -3,7 +3,7 @@
 // authentication.
 //
 // Regression test for SERVER-8144.
-var conn = MongoRunner.runMongod({auth: "", smallfiles: ""});
+var conn = MongoRunner.runMongod({auth: ""});
 var admin = conn.getDB("admin");
 var test = conn.getDB("test");
 
@@ -28,4 +28,4 @@ test.foo.findOne();
 test.auth('reader', 'a');
 assert.writeError(test.docs.insert({value: 2}));
 test.foo.findOne();
-MongoRunner.stopMongod(conn, null, {user: 'admin', pwd: 'a'});
\ No newline at end of file
+MongoRunner.stopMongod(conn, null, {user: 'admin', pwd: 'a'});
diff --git a/jstests/auth/disable_localhost_bypass.js b/jstests/auth/disable_localhost_bypass.js
index 175c786116a..f26eb4f6ed6 100644
--- a/jstests/auth/disable_localhost_bypass.js
+++ b/jstests/auth/disable_localhost_bypass.js
@@ -1,7 +1,5 @@
-var conn1 = MongoRunner.runMongod(
-    {auth: "", smallfiles: "", setParameter: "enableLocalhostAuthBypass=true"});
-var conn2 = MongoRunner.runMongod(
-    {auth: "", smallfiles: "", setParameter: "enableLocalhostAuthBypass=false"});
+var conn1 = MongoRunner.runMongod({auth: "", setParameter: "enableLocalhostAuthBypass=true"});
+var conn2 = MongoRunner.runMongod({auth: "", setParameter: "enableLocalhostAuthBypass=false"});
 
 // Should fail because of localhost exception narrowed (SERVER-12621).
 assert.writeError(conn1.getDB("test").foo.insert({a: 1}));
@@ -29,4 +27,4 @@ assert.throws(function() {
 
 print("SUCCESS Completed disable_localhost_bypass.js");
 MongoRunner.stopMongod(conn1, null, {user: "root", pwd: "pass"});
-MongoRunner.stopMongod(conn2, null, {user: "root", pwd: "pass"});
\ No newline at end of file
+MongoRunner.stopMongod(conn2, null, {user: "root", pwd: "pass"});
diff --git a/jstests/auth/js_scope_leak.js b/jstests/auth/js_scope_leak.js
index cb09fcda70e..f209e6093e3 100644
--- a/jstests/auth/js_scope_leak.js
+++ b/jstests/auth/js_scope_leak.js
@@ -7,7 +7,7 @@
 //
 //       These transitions are tested for $where and MapReduce.
 
-var conn = MongoRunner.runMongod({smallfiles: ""});
+var conn = MongoRunner.runMongod();
 var test = conn.getDB("test");
 
 // insert a single document and add two test users
diff --git a/jstests/auth/show_log_auth.js b/jstests/auth/show_log_auth.js
index 3bbbb852ff6..7fd0574923b 100644
--- a/jstests/auth/show_log_auth.js
+++ b/jstests/auth/show_log_auth.js
@@ -2,7 +2,7 @@
 
 var baseName = "jstests_show_log_auth";
 
-var m = MongoRunner.runMongod({auth: "", bind_ip: "127.0.0.1", smallfiles: ""});
+var m = MongoRunner.runMongod({auth: "", bind_ip: "127.0.0.1"});
 var db = m.getDB("admin");
 
 db.createUser({user: "admin", pwd: "pass", roles: jsTest.adminUserRoles});
diff --git a/jstests/auth/system_user_privileges.js b/jstests/auth/system_user_privileges.js
index 548dbf7eccd..164ba9bd2e4 100644
--- a/jstests/auth/system_user_privileges.js
+++ b/jstests/auth/system_user_privileges.js
@@ -27,7 +27,7 @@
                   "On " + dbName + "." + collectionName);
     }
 
-    var conn = MongoRunner.runMongod({smallfiles: "", auth: ""});
+    var conn = MongoRunner.runMongod({auth: ""});
 
     var admin = conn.getDB('admin');
     var test = conn.getDB('test');
diff --git a/jstests/disk/too_many_fds.js b/jstests/disk/too_many_fds.js
index fc5a2dd78bd..f7fa331b956 100644
--- a/jstests/disk/too_many_fds.js
+++ b/jstests/disk/too_many_fds.js
@@ -4,7 +4,7 @@
 function doTest() {
     var baseName = "jstests_disk_too_many_fds";
 
-    var m = MongoRunner.runMongod({smallfiles: "", nssize: 1});
+    var m = MongoRunner.runMongod({nssize: 1});
     // Make 1026 collections, each in a separate database.  On some storage engines, this may cause
     // 1026 files to be created.
     for (var i = 1; i < 1026; ++i) {
@@ -16,8 +16,7 @@ function doTest() {
     MongoRunner.stopMongod(m);
 
     // Ensure we can still start up with that many files.
-    var m2 = MongoRunner.runMongod(
-        {dbpath: m.dbpath, smallfiles: "", nssize: 1, restart: true, cleanData: false});
+    var m2 = MongoRunner.runMongod({dbpath: m.dbpath, nssize: 1, restart: true, cleanData: false});
     assert.eq(1, m2.getDB("db1025").getCollection("coll1025").count());
     MongoRunner.stopMongod(m2);
 
diff --git a/jstests/noPassthrough/devnull.js b/jstests/noPassthrough/devnull.js
index 857b3c1c2a8..c2e09279b5e 100644
--- a/jstests/noPassthrough/devnull.js
+++ b/jstests/noPassthrough/devnull.js
@@ -1,5 +1,5 @@
 (function() {
-    var mongo = MongoRunner.runMongod({smallfiles: "", storageEngine: "devnull"});
+    var mongo = MongoRunner.runMongod({storageEngine: "devnull"});
 
     db = mongo.getDB("test");
 
diff --git a/jstests/noPassthrough/geo_full.js b/jstests/noPassthrough/geo_full.js
index bf123d3276e..7bebdce9dba 100644
--- a/jstests/noPassthrough/geo_full.js
+++ b/jstests/noPassthrough/geo_full.js
@@ -23,7 +23,7 @@
 
     load("jstests/libs/geo_math.js");
 
-    const conn = MongoRunner.runMongod({smallfiles: ""});
+    const conn = MongoRunner.runMongod();
     assert.neq(null, conn, "mongod failed to start.");
     const db = conn.getDB("test");
 
diff --git a/jstests/noPassthrough/geo_mnypts_plus_fields.js b/jstests/noPassthrough/geo_mnypts_plus_fields.js
index 5bb8f1147e8..6eb52933161 100644
--- a/jstests/noPassthrough/geo_mnypts_plus_fields.js
+++ b/jstests/noPassthrough/geo_mnypts_plus_fields.js
@@ -2,7 +2,7 @@
 
 (function() {
     "use strict";
-    const conn = MongoRunner.runMongod({smallfiles: ""});
+    const conn = MongoRunner.runMongod();
     assert.neq(null, conn, "mongod failed to start.");
     const db = conn.getDB("test");
 
diff --git a/jstests/noPassthrough/geo_near_random1.js b/jstests/noPassthrough/geo_near_random1.js
index 2a7bcb3e50e..9c59e21c9a0 100644
--- a/jstests/noPassthrough/geo_near_random1.js
+++ b/jstests/noPassthrough/geo_near_random1.js
@@ -4,7 +4,7 @@ var db;
     "use strict";
     load("jstests/libs/geo_near_random.js");
 
-    const conn = MongoRunner.runMongod({smallfiles: ""});
+    const conn = MongoRunner.runMongod();
     assert.neq(null, conn, "mongod failed to start.");
     db = conn.getDB("test");
 
diff --git a/jstests/noPassthrough/geo_near_random2.js b/jstests/noPassthrough/geo_near_random2.js
index fb3b49538c3..aa09ebac6ff 100644
--- a/jstests/noPassthrough/geo_near_random2.js
+++ b/jstests/noPassthrough/geo_near_random2.js
@@ -4,7 +4,7 @@ var db;
     "use strict";
     load("jstests/libs/geo_near_random.js");
 
-    const conn = MongoRunner.runMongod({smallfiles: ""});
+    const conn = MongoRunner.runMongod();
     assert.neq(null, conn, "mongod failed to start.");
     db = conn.getDB("test");
 
diff --git a/jstests/noPassthrough/index_killop.js b/jstests/noPassthrough/index_killop.js
index 1648f717842..2c57ba982ff 100644
--- a/jstests/noPassthrough/index_killop.js
+++ b/jstests/noPassthrough/index_killop.js
@@ -4,7 +4,7 @@
 (function() {
     "use strict";
 
-    const conn = MongoRunner.runMongod({smallfiles: ""});
+    const conn = MongoRunner.runMongod();
     assert.neq(null, conn, "mongod was unable to start up");
 
     const testDB = conn.getDB("test");
diff --git a/jstests/noPassthrough/indexbg1.js b/jstests/noPassthrough/indexbg1.js
index 5b47bc43de2..6be447c39b1 100644
--- a/jstests/noPassthrough/indexbg1.js
+++ b/jstests/noPassthrough/indexbg1.js
@@ -6,7 +6,7 @@
 
     load("jstests/noPassthrough/libs/index_build.js");
 
-    const conn = MongoRunner.runMongod({smallfiles: "", nojournal: ""});
+    const conn = MongoRunner.runMongod({nojournal: ""});
     assert.neq(null, conn, "mongod failed to start.");
     var db = conn.getDB("test");
     var baseName = "jstests_indexbg1";
diff --git a/jstests/noPassthrough/indexbg2.js b/jstests/noPassthrough/indexbg2.js
index 3e62a33a41d..6fd10dc2dfe 100644
--- a/jstests/noPassthrough/indexbg2.js
+++ b/jstests/noPassthrough/indexbg2.js
@@ -7,7 +7,7 @@
     load("jstests/noPassthrough/libs/index_build.js");
     load("jstests/libs/check_log.js");
 
-    const conn = MongoRunner.runMongod({smallfiles: "", nojournal: ""});
+    const conn = MongoRunner.runMongod({nojournal: ""});
     assert.neq(null, conn, "mongod failed to start.");
 
     let db = conn.getDB("test");
diff --git a/jstests/noPassthrough/list_indexes_only_ready_indexes.js b/jstests/noPassthrough/list_indexes_only_ready_indexes.js
index 95dfe056d8a..179648af7f7 100644
--- a/jstests/noPassthrough/list_indexes_only_ready_indexes.js
+++ b/jstests/noPassthrough/list_indexes_only_ready_indexes.js
@@ -4,7 +4,7 @@
 
     load("jstests/noPassthrough/libs/index_build.js");
 
-    const conn = MongoRunner.runMongod({smallfiles: ""});
+    const conn = MongoRunner.runMongod();
     assert.neq(null, conn, "mongod was unable to start up");
 
     const testDB = conn.getDB("test");
diff --git a/jstests/noPassthrough/lock_file.js b/jstests/noPassthrough/lock_file.js
index 19859de1b3d..5ff9a897bf9 100644
--- a/jstests/noPassthrough/lock_file.js
+++ b/jstests/noPassthrough/lock_file.js
@@ -18,7 +18,7 @@
     var dbpath = MongoRunner.dataPath + baseName + '/';
 
     // Test framework will append --storageEngine command line option.
-    var mongod = MongoRunner.runMongod({dbpath: dbpath, smallfiles: ""});
+    var mongod = MongoRunner.runMongod({dbpath: dbpath});
     assert.neq(0,
                getMongodLockFileSize(dbpath),
                'mongod.lock should not be empty while server is running');
diff --git a/jstests/noPassthrough/ns1.js b/jstests/noPassthrough/ns1.js
index c4bad514d29..130ddf77db2 100644
--- a/jstests/noPassthrough/ns1.js
+++ b/jstests/noPassthrough/ns1.js
@@ -1,6 +1,6 @@
 (function() {
     "use strict";
-    const conn = MongoRunner.runMongod({smallfiles: ""});
+    const conn = MongoRunner.runMongod();
     assert.neq(null, conn, "mongod failed to start.");
     let mydb = conn.getDB("test_ns1");
 
diff --git a/jstests/noPassthrough/query_yield1.js b/jstests/noPassthrough/query_yield1.js
index fd57f53b077..4effd6b370f 100644
--- a/jstests/noPassthrough/query_yield1.js
+++ b/jstests/noPassthrough/query_yield1.js
@@ -1,7 +1,7 @@
 (function() {
     "use strict";
     if (0) {  // Test disabled until SERVER-8579 is finished. Reminder ticket: SERVER-8342
-        const conn = MongoRunner.runMongod({smallfiles: "", nojournal: ""});
+        const conn = MongoRunner.runMongod({nojournal: ""});
         assert.neq(null, conn, "mongod failed to start.");
         db = conn.getDB("test");
 
diff --git a/jstests/noPassthrough/query_yield2.js b/jstests/noPassthrough/query_yield2.js
index e9c1ef92543..e5257653fd1 100644
--- a/jstests/noPassthrough/query_yield2.js
+++ b/jstests/noPassthrough/query_yield2.js
@@ -12,7 +12,7 @@
         var start;
         var insertTime;
 
-        const conn = MongoRunner.runMongod({smallfiles: "", nojournal: ""});
+        const conn = MongoRunner.runMongod({nojournal: ""});
         assert.neq(null, conn, "mongod failed to start.");
         db = conn.getDB("test");
 
diff --git a/jstests/noPassthrough/repair2.js b/jstests/noPassthrough/repair2.js
index 58ca594a2e2..05d73cc762e 100644
--- a/jstests/noPassthrough/repair2.js
+++ b/jstests/noPassthrough/repair2.js
@@ -4,7 +4,7 @@
     "use strict";
     const baseName = "jstests_repair2";
 
-    const conn = MongoRunner.runMongod({smallfiles: ""});
+    const conn = MongoRunner.runMongod();
     assert.neq(null, conn, "mongod failed to start.");
 
     const t = conn.getDB(baseName)[baseName];
diff --git a/jstests/noPassthrough/system_indexes.js b/jstests/noPassthrough/system_indexes.js
index a85ac0b3f6c..fb0991b1abb 100644
--- a/jstests/noPassthrough/system_indexes.js
+++ b/jstests/noPassthrough/system_indexes.js
@@ -5,7 +5,7 @@
  */
 
 (function() {
-    let conn = MongoRunner.runMongod({smallfiles: ""});
+    let conn = MongoRunner.runMongod();
     let config = conn.getDB("config");
     let db = conn.getDB("admin");
 
diff --git a/jstests/noPassthrough/update_server-5552.js b/jstests/noPassthrough/update_server-5552.js
index f2250eb5f07..c0a8dc4fb2e 100644
--- a/jstests/noPassthrough/update_server-5552.js
+++ b/jstests/noPassthrough/update_server-5552.js
@@ -1,7 +1,7 @@
 var db;
 (function() {
     "use strict";
-    const conn = MongoRunner.runMongod({smallfiles: ""});
+    const conn = MongoRunner.runMongod();
     assert.neq(null, conn, "mongod failed to start.");
     db = conn.getDB("test");
 
diff --git a/jstests/noPassthroughWithMongod/newcollection2.js b/jstests/noPassthroughWithMongod/newcollection2.js
index 18b700d677b..ecc0fb289c8 100644
--- a/jstests/noPassthroughWithMongod/newcollection2.js
+++ b/jstests/noPassthroughWithMongod/newcollection2.js
@@ -1,7 +1,7 @@
 // Alocate collection forcing just a small size remainder in 2nd extent
 
 var baseName = "jstests_disk_newcollection2";
-var m = MongoRunner.runMongod({noprealloc: "", smallfiles: ""});
+var m = MongoRunner.runMongod({noprealloc: ""});
 db = m.getDB("test");
 
 db.createCollection(baseName, {size: 0x1FFC0000 - 0x10 - 8192});
@@ -15,4 +15,4 @@ assert(v.valid);
 db.runCommand({applyOps: [{op: 'u', ns: 'a\0b'}]});
 var res = db["a\0a"].insert({});
 assert(res instanceof WriteCommandError, "A write to collection a\0a succceeded");
-MongoRunner.stopMongod(m);
\ No newline at end of file
+MongoRunner.stopMongod(m);
diff --git a/jstests/noPassthroughWithMongod/temp_namespace.js b/jstests/noPassthroughWithMongod/temp_namespace.js
index d84dcb302f3..5627c5d9901 100644
--- a/jstests/noPassthroughWithMongod/temp_namespace.js
+++ b/jstests/noPassthroughWithMongod/temp_namespace.js
@@ -5,7 +5,7 @@
 
 testname = 'temp_namespace_sw';
 
-var conn = MongoRunner.runMongod({smallfiles: "", noprealloc: "", nopreallocj: ""});
+var conn = MongoRunner.runMongod({noprealloc: ""});
 d = conn.getDB('test');
 d.runCommand({create: testname + 'temp1', temp: true});
 d[testname + 'temp1'].ensureIndex({x: 1});
@@ -32,9 +32,7 @@ conn = MongoRunner.runMongod({
     restart: true,
     cleanData: false,
     dbpath: conn.dbpath,
-    smallfiles: "",
     noprealloc: "",
-    nopreallocj: ""
 });
 d = conn.getDB('test');
 assert.eq(countCollectionNames(d, /temp\d$/), 0);
diff --git a/jstests/readonly/lib/read_only_test.js b/jstests/readonly/lib/read_only_test.js
index cc94a2fbe89..ef04350d5e0 100644
--- a/jstests/readonly/lib/read_only_test.js
+++ b/jstests/readonly/lib/read_only_test.js
@@ -53,12 +53,8 @@ var StandaloneFixture, ShardedFixture, runReadOnlyTest, zip2, cycleN;
 
     ShardedFixture.prototype.runLoadPhase = function runLoadPhase(test) {
         // TODO: SERVER-33830 remove shardAsReplicaSet: false
-        this.shardingTest = new ShardingTest({
-            nopreallocj: true,
-            mongos: 1,
-            shards: this.nShards,
-            other: {shardAsReplicaSet: false}
-        });
+        this.shardingTest =
+            new ShardingTest({mongos: 1, shards: this.nShards, other: {shardAsReplicaSet: false}});
 
         this.paths = this.shardingTest.getDBPaths();
 
diff --git a/jstests/replsets/oplog_format.js b/jstests/replsets/oplog_format.js
index 2fd87e2d665..d4ae2345f30 100644
--- a/jstests/replsets/oplog_format.js
+++ b/jstests/replsets/oplog_format.js
@@ -6,7 +6,7 @@
  */
 
 "use strict";
-var replTest = new ReplSetTest({nodes: 1, oplogSize: 2, nodeOptions: {smallfiles: ""}});
+var replTest = new ReplSetTest({nodes: 1, oplogSize: 2});
 var nodes = replTest.startSet();
 replTest.initiate();
 var master = replTest.getPrimary();
diff --git a/jstests/replsets/oplog_wallclock.js b/jstests/replsets/oplog_wallclock.js
index b11b125923b..2da05916c1f 100644
--- a/jstests/replsets/oplog_wallclock.js
+++ b/jstests/replsets/oplog_wallclock.js
@@ -10,7 +10,7 @@
     };
 
     var name = 'wt_test_coll';
-    var replSet = new ReplSetTest({nodes: 1, oplogSize: 2, nodeOptions: {smallfiles: ''}});
+    var replSet = new ReplSetTest({nodes: 1, oplogSize: 2});
     replSet.startSet();
     replSet.initiate();
 
diff --git a/jstests/sharding/mr_noscripting.js b/jstests/sharding/mr_noscripting.js
index 6bf196c587e..abe2e1fbbe4 100644
--- a/jstests/sharding/mr_noscripting.js
+++ b/jstests/sharding/mr_noscripting.js
@@ -3,7 +3,7 @@ var shardOpts = [
     {}  // just use default params
 ];
 
-var st = new ShardingTest({shards: shardOpts, other: {nopreallocj: 1}});
+var st = new ShardingTest({shards: shardOpts});
 var mongos = st.s;
 
 st.shardColl('bar', {x: 1});
@@ -37,4 +37,4 @@ mongos.getDB('config').shards.find().forEach(function(shardDoc) {
     assert(cmdResult.ok,
            'serverStatus on ' + shardDoc.host + ' failed, result: ' + tojson(cmdResult));
 });
-st.stop();
\ No newline at end of file
+st.stop();
diff --git a/jstests/sharding/printShardingStatus.js b/jstests/sharding/printShardingStatus.js
index cf2b8d454a0..15fc549050e 100644
--- a/jstests/sharding/printShardingStatus.js
+++ b/jstests/sharding/printShardingStatus.js
@@ -5,7 +5,7 @@
 (function() {
     'use strict';
 
-    var st = new ShardingTest({shards: 1, mongos: 2, config: 1, other: {smallfiles: true}});
+    var st = new ShardingTest({shards: 1, mongos: 2, config: 1});
 
     var standalone = MongoRunner.runMongod();
 
diff --git a/jstests/slow1/conc_update.js b/jstests/slow1/conc_update.js
index e46e132bd61..57e4ba134cb 100644
--- a/jstests/slow1/conc_update.js
+++ b/jstests/slow1/conc_update.js
@@ -1,7 +1,7 @@
 (function() {
     "use strict";
 
-    const conn = MongoRunner.runMongod({smallfiles: "", nojournal: ""});
+    const conn = MongoRunner.runMongod({nojournal: ""});
     assert.neq(null, conn, "mongod was unable to start up");
     db = conn.getDB("concurrency");
     db.dropDatabase();
diff --git a/jstests/ssl/disable_x509.js b/jstests/ssl/disable_x509.js
index 6d251e66b94..a0810370035 100644
--- a/jstests/ssl/disable_x509.js
+++ b/jstests/ssl/disable_x509.js
@@ -3,7 +3,6 @@
 var CLIENT_USER = "C=US,ST=New York,L=New York City,O=MongoDB,OU=KernelUser,CN=client";
 
 var conn = MongoRunner.runMongod({
-    smallfiles: "",
     auth: "",
     sslMode: "requireSSL",
     sslPEMKeyFile: "jstests/libs/server.pem",
@@ -46,4 +45,4 @@ if (cmdOut.ok) {
     MongoRunner.stopMongod(conn);
 } else {
     MongoRunner.stopMongod(conn);
-}
\ No newline at end of file
+}
diff --git a/jstests/ssl/ssl_alert_reporting.js b/jstests/ssl/ssl_alert_reporting.js
index da8b630bf0c..9e06311c71e 100644
--- a/jstests/ssl/ssl_alert_reporting.js
+++ b/jstests/ssl/ssl_alert_reporting.js
@@ -32,7 +32,6 @@ load('jstests/ssl/libs/ssl_helpers.js');
         }
 
         var md = MongoRunner.runMongod({
-            nopreallocj: "",
             sslMode: "requireSSL",
             sslCAFile: "jstests/libs/ca.pem",
             sslPEMKeyFile: "jstests/libs/server.pem",
diff --git a/jstests/ssl/ssl_cert_password.js b/jstests/ssl/ssl_cert_password.js
index 356c0603c84..df2b0205d0a 100644
--- a/jstests/ssl/ssl_cert_password.js
+++ b/jstests/ssl/ssl_cert_password.js
@@ -15,7 +15,6 @@ requireSSLProvider('openssl', function() {
 
     // Password is correct
     var md = MongoRunner.runMongod({
-        nopreallocj: "",
         dbpath: dbpath,
         sslMode: "requireSSL",
         sslPEMKeyFile: "jstests/libs/password_protected.pem",
diff --git a/jstests/ssl/x509_client.js b/jstests/ssl/x509_client.js
index 09c546e2cb9..d834cb46cea 100644
--- a/jstests/ssl/x509_client.js
+++ b/jstests/ssl/x509_client.js
@@ -1,6 +1,5 @@
 // Check if this build supports the authenticationMechanisms startup parameter.
 var conn = MongoRunner.runMongod({
-    smallfiles: "",
     auth: "",
     sslMode: "requireSSL",
     sslPEMKeyFile: "jstests/libs/server.pem",
diff --git a/src/mongo/dbtests/framework_options.cpp b/src/mongo/dbtests/framework_options.cpp
index 0d2a4768213..192760718d4 100644
--- a/src/mongo/dbtests/framework_options.cpp
+++ b/src/mongo/dbtests/framework_options.cpp
@@ -79,11 +79,6 @@ Status addTestFrameworkOptions(moe::OptionSection* options) {
 
     options->addOptionChaining("list", "list,l", moe::Switch, "list available test suites");
 
-    options->addOptionChaining("bigfiles",
-                               "bigfiles",
-                               moe::Switch,
-                               "use big datafiles instead of smallfiles which is the default");
-
     options->addOptionChaining(
         "filter", "filter,f", moe::String, "string substring filter on test name");
 
@@ -110,11 +105,6 @@ Status addTestFrameworkOptions(moe::OptionSection* options) {
         .hidden()
         .positional(1, -1);
 
-    options
-        ->addOptionChaining("nopreallocj", "nopreallocj", moe::Switch, "disable journal prealloc")
-        .hidden();
-
-
     return Status::OK();
 }
 
diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js
index 94e5e8b18b3..cf4938d6fd6 100644
--- a/src/mongo/shell/replsettest.js
+++ b/src/mongo/shell/replsettest.js
@@ -2191,7 +2191,6 @@ var ReplSetTest = function(opts) {
             keyFile: this.keyFile,
             port: _useBridge ? _unbridgedPorts[n] : this.ports[n],
             noprealloc: "",
-            smallfiles: "",
             replSet: this.useSeedList ? this.getURL() : this.name,
             dbpath: "$set-$node"
         };
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index 2939cbc4f51..2506259d984 100644
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -238,7 +238,6 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
         noReplSet: true,
         forgetPort: true,
         arbiter: true,
-        noJournalPrealloc: true,
         noJournal: true,
         binVersion: true,
         waitForConnect: true,
@@ -362,11 +361,6 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
                 if (!o.binVersion)
                     return true;
 
-                // Version 1.x options
-                if (o.binVersion.startsWith("1.")) {
-                    return ["nopreallocj"].indexOf(option) < 0;
-                }
-
                 return true;
             };
 
@@ -580,7 +574,6 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
      *     useLogFiles {boolean}: use with logFile option.
      *     logFile {string}: path to the log file. If not specified and useLogFiles
      *       is true, automatically creates a log file inside dbpath.
-     *     noJournalPrealloc {boolean}
      *     noJournal {boolean}
      *     keyFile
      *     replSet
@@ -609,9 +602,6 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
             opts.logpath = opts.logFile;
         }
 
-        if (jsTestOptions().noJournalPrealloc || opts.noJournalPrealloc)
-            opts.nopreallocj = "";
-
         if ((jsTestOptions().noJournal || opts.noJournal) && !('journal' in opts) &&
             !('configsvr' in opts)) {
             opts.nojournal = "";
diff --git a/src/mongo/shell/servers_misc.js b/src/mongo/shell/servers_misc.js
index 89a07564b66..a83a9e507b4 100644
--- a/src/mongo/shell/servers_misc.js
+++ b/src/mongo/shell/servers_misc.js
@@ -14,13 +14,7 @@ ToolTest = function(name, extraOptions) {
 ToolTest.prototype.startDB = function(coll) {
     assert(!this.m, "db already running");
 
-    var options = {
-        port: this.port,
-        dbpath: this.dbpath,
-        noprealloc: "",
-        smallfiles: "",
-        bind_ip: "127.0.0.1"
-    };
+    var options = {port: this.port, dbpath: this.dbpath, noprealloc: "", bind_ip: "127.0.0.1"};
 
     Object.extend(options, this.options);
 
diff --git a/src/mongo/shell/shardingtest.js b/src/mongo/shell/shardingtest.js
index 864c23b510c..9ca112c48a2 100644
--- a/src/mongo/shell/shardingtest.js
+++ b/src/mongo/shell/shardingtest.js
@@ -12,7 +12,6 @@
  *     name {string}: name for this test
  *     verbose {number}: the verbosity for the mongos
  *     chunkSize {number}: the chunk size to use as configuration for the cluster
- *     nopreallocj {boolean|number}:
  *
  *     mongos {number|Object|Array.<Object>}: number of mongos or mongos
  *       configuration object(s)(*). @see MongoRunner.runMongos
@@ -54,7 +53,6 @@
  *          options take precedence.
  *
  *     other: {
- *       nopreallocj: same as above
  *       rs: same as above
  *       chunkSize: same as above
  *       keyFile {string}: the location of the keyFile
@@ -1063,7 +1061,7 @@ var ShardingTest = function(params) {
 
     // Allow specifying mixed-type options like this:
     // { mongos : [ { noprealloc : "" } ],
-    //   config : [ { smallfiles : "" } ],
+    //   config : [ { nojournal : "" } ],
     //   shards : { rs : true, d : true } }
     if (Array.isArray(numShards)) {
         for (var i = 0; i < numShards.length; i++) {
@@ -1149,7 +1147,6 @@ var ShardingTest = function(params) {
 
             var rsDefaults = {
                 useHostname: otherParams.useHostname,
-                noJournalPrealloc: otherParams.nopreallocj,
                 oplogSize: 16,
                 shardsvr: '',
                 pathOpts: Object.merge(pathOpts, {shard: i}),
@@ -1238,7 +1235,6 @@ var ShardingTest = function(params) {
         } else {
             var options = {
                 useHostname: otherParams.useHostname,
-                noJournalPrealloc: otherParams.nopreallocj,
                 pathOpts: Object.merge(pathOpts, {shard: i}),
                 dbpath: "$testName$shard",
                 shardsvr: '',
@@ -1347,7 +1343,6 @@ var ShardingTest = function(params) {
         // Ensure that journaling is always enabled for config servers.
         journal: "",
         configsvr: "",
-        noJournalPrealloc: otherParams.nopreallocj,
         storageEngine: "wiredTiger",
     };
 
diff --git a/src/mongo/shell/utils.js b/src/mongo/shell/utils.js
index ab1c7120735..dafdac4101d 100644
--- a/src/mongo/shell/utils.js
+++ b/src/mongo/shell/utils.js
@@ -259,7 +259,6 @@ jsTestOptions = function() {
             wiredTigerCollectionConfigString: TestData.wiredTigerCollectionConfigString,
             wiredTigerIndexConfigString: TestData.wiredTigerIndexConfigString,
             noJournal: TestData.noJournal,
-            noJournalPrealloc: TestData.noJournalPrealloc,
             auth: TestData.auth,
             // Note: keyFile is also used as a flag to indicate cluster auth is turned on, set it
             // to a truthy value if you'd like to do cluster auth, even if it's not keyFile auth.