1 files changed, 5 insertions, 22 deletions

diff --git a/src/mongo/s/sharding_router_test_fixture.cpp b/src/mongo/s/sharding_router_test_fixture.cpp
index 132e375b160..e42c1e41316 100644
--- a/src/mongo/s/sharding_router_test_fixture.cpp
+++ b/src/mongo/s/sharding_router_test_fixture.cpp
@@ -44,7 +44,6 @@
 #include "mongo/db/query/collation/collator_factory_mock.h"
 #include "mongo/db/query/query_request.h"
 #include "mongo/db/repl/read_concern_args.h"
-#include "mongo/db/service_context_noop.h"
 #include "mongo/executor/network_interface_mock.h"
 #include "mongo/executor/task_executor_pool.h"
 #include "mongo/executor/thread_pool_task_executor_test_fixture.h"
@@ -94,12 +93,8 @@ std::unique_ptr<ShardingTaskExecutor> makeShardingTestExecutor(
 
 }  // namespace
 
-ShardingTestFixture::ShardingTestFixture() = default;
-
-ShardingTestFixture::~ShardingTestFixture() = default;
-
-void ShardingTestFixture::setUp() {
-    auto const service = serviceContext();
+ShardingTestFixture::ShardingTestFixture() {
+    auto const service = getServiceContext();
 
     // Configure the service context
     service->setFastClockSource(stdx::make_unique<ClockSourceMock>());
@@ -108,8 +103,7 @@ void ShardingTestFixture::setUp() {
 
     CollatorFactoryInterface::set(service, stdx::make_unique<CollatorFactoryMock>());
     _transportSession = transport::MockSession::create(nullptr);
-    _client = service->makeClient("ShardingTestFixture", _transportSession);
-    _opCtx = _client->makeOperationContext();
+    _opCtx = makeOperationContext();
 
     // Set up executor pool used for most operations.
     auto makeMetadataHookList = [&] {
@@ -194,16 +188,9 @@ void ShardingTestFixture::setUp() {
                _mockNetwork);
 }
 
-void ShardingTestFixture::tearDown() {
-    CatalogCacheLoader::clearForTests(serviceContext());
-
-    Grid::get(operationContext())->getExecutorPool()->shutdownAndJoin();
-    Grid::get(operationContext())->catalogClient()->shutDown(_opCtx.get());
-    Grid::get(operationContext())->clearForUnitTests();
 
-    _transportSession.reset();
-    _opCtx.reset();
-    _client.reset();
+ShardingTestFixture::~ShardingTestFixture() {
+    CatalogCacheLoader::clearForTests(getServiceContext());
 }
 
 void ShardingTestFixture::shutdownExecutor() {
@@ -243,10 +230,6 @@ DistLockManagerMock* ShardingTestFixture::distLock() const {
     return _distLockManager;
 }
 
-ServiceContext* ShardingTestFixture::serviceContext() const {
-    return getGlobalServiceContext();
-}
-
 OperationContext* ShardingTestFixture::operationContext() const {
     invariant(_opCtx);