1 files changed, 2 insertions, 10 deletions
diff --git a/jstests/sharding/conversion_of_replica_set_to_sharded_cluster.js b/jstests/sharding/conversion_of_replica_set_to_sharded_cluster.js
index 15a0ab42bf5..6c5933c381c 100644
--- a/jstests/sharding/conversion_of_replica_set_to_sharded_cluster.js
+++ b/jstests/sharding/conversion_of_replica_set_to_sharded_cluster.js
@@ -12,6 +12,7 @@
 'use strict';
 
 load('jstests/replsets/rslib.js');
+load('jstests/sharding/libs/remove_shard_util.js');
 
 // TODO SERVER-50144 Remove this and allow orphan checking.
 // This test calls removeShard which can leave docs in config.rangeDeletions in state "pending",
@@ -259,16 +260,7 @@ let assertAddShardSucceeded = function(res, shardName) {
                "newly added shard " + res.shardAdded + " not found in config.shards");
 };
 
-var removeShardWithName = function(st, shardName) {
-    var res = st.s.adminCommand({removeShard: shardName});
-    assert.commandWorked(res);
-    assert.eq('started', res.state);
-    assert.soon(function() {
-        res = st.s.adminCommand({removeShard: shardName});
-        assert.commandWorked(res);
-        return ('completed' === res.state);
-    }, "removeShard never completed for shard " + shardName);
-};
+let removeShardWithName = removeShard;
 
 let checkCRUDCommands = function(testDB) {
     for (let command in CRUDCommands) {