5 files changed, 6 insertions, 8 deletions
diff --git a/jstests/core/fts_index.js b/jstests/core/fts_index.js
index af927c86f48..7e52b761df3 100644
--- a/jstests/core/fts_index.js
+++ b/jstests/core/fts_index.js
@@ -15,22 +15,22 @@ coll.getDB().createCollection(coll.getName());
 
 // Spec passes text-specific index validation.
 assert.commandWorked(coll.ensureIndex({a: "text"}, {name: indexName, default_language: "spanish"}));
-assert.eq(1, coll.getDB().system.indexes.count({ns: coll.getFullName(), name: indexName}));
+assert.eq( 1, coll.getIndexes().filter( function(z){ return z.name == indexName; } ).length );
 coll.dropIndexes();
 
 // Spec fails text-specific index validation ("spanglish" unrecognized).
 assert.commandFailed(coll.ensureIndex({a: "text"}, {name: indexName, default_language: "spanglish"}));
-assert.eq(0, coll.system.indexes.count({ns: coll.getFullName(), name: indexName}));
+assert.eq( 0, coll.getIndexes().filter( function(z){ return z.name == indexName; } ).length );
 coll.dropIndexes();
 
 // Spec passes general index validation.
 assert.commandWorked(coll.ensureIndex({"$**": "text"}, {name: indexName}));
-assert.eq(1, coll.getDB().system.indexes.count({ns: coll.getFullName(), name: indexName}));
+assert.eq( 1, coll.getIndexes().filter( function(z){ return z.name == indexName; } ).length );
 coll.dropIndexes();
 
 // Spec fails general index validation ("a.$**" invalid field name for key).
 assert.commandFailed(coll.ensureIndex({"a.$**": "text"}, {name: indexName}));
-assert.eq(0, coll.getDB().system.indexes.count({ns: coll.getFullName(), name: indexName}));
+assert.eq( 0, coll.getIndexes().filter( function(z){ return z.name == indexName; } ).length );
 coll.dropIndexes();
 
 //
diff --git a/jstests/core/geo10.js b/jstests/core/geo10.js
index e098d4eef11..25bfc7b8ce6 100644
--- a/jstests/core/geo10.js
+++ b/jstests/core/geo10.js
@@ -4,9 +4,7 @@ coll = db.geo10
 coll.drop();
 
 assert.commandWorked( db.geo10.ensureIndex( { c : '2d', t : 1 }, { min : 0, max : Math.pow( 2, 40 ) } ));
-assert( db.system.indexes.count({ ns : "test.geo10" }) == 2, "A3" )
-
-printjson( db.system.indexes.find().toArray() )
+assert.eq( 2, db.geo10.getIndexes().length, "A3" )
 
 assert.writeOK( db.geo10.insert( { c : [ 1, 1 ], t : 1 } ));
 assert.writeOK( db.geo10.insert( { c : [ 3600, 3600 ], t : 1 } ));
diff --git a/jstests/core/geo_s2indexversion1.js b/jstests/core/geo_s2indexversion1.js
index bfb70e3a16c..3d17fee9333 100644
--- a/jstests/core/geo_s2indexversion1.js
+++ b/jstests/core/geo_s2indexversion1.js
@@ -71,7 +71,7 @@ coll.drop();
 
 res = coll.ensureIndex({geo: "2dsphere"});
 assert.commandWorked(res);
-var specObj = coll.getDB().system.indexes.findOne({ns: coll.getFullName(), name: "geo_2dsphere"});
+var specObj = coll.getIndexes().filter( function(z){ return z.name == "geo_2dsphere"; } )[0];
 assert.eq(2, specObj["2dsphereIndexVersion"]);
 coll.drop();
 
diff --git a/jstests/core/update.js b/jstests/mmap_v1/update.js
index 37bf6378c64..37bf6378c64 100644
--- a/jstests/core/update.js
+++ b/jstests/mmap_v1/update.js
diff --git a/jstests/core/use_power_of_2.js b/jstests/mmap_v1/use_power_of_2.js
index 8eb24233cf1..8eb24233cf1 100644
--- a/jstests/core/use_power_of_2.js
+++ b/jstests/mmap_v1/use_power_of_2.js