diff --git a/packages/assets-controllers/src/TokenDetectionController.test.ts b/packages/assets-controllers/src/TokenDetectionController.test.ts
index 1d6bfc46451..9380fad3383 100644
--- a/packages/assets-controllers/src/TokenDetectionController.test.ts
+++ b/packages/assets-controllers/src/TokenDetectionController.test.ts
@@ -2,12 +2,17 @@ import * as sinon from 'sinon';
 import nock from 'nock';
 import { BN } from 'ethereumjs-util';
 import {
-  NetworkController,
-  NetworkControllerMessenger,
   NetworkControllerProviderConfigChangeEvent,
   NetworkControllerStateChangeEvent,
+  defaultState as defaultNetworkState,
+  NetworkState,
+  ProviderConfig,
 } from '@metamask/network-controller';
-import { NetworksChainId, MAINNET } from '@metamask/controller-utils';
+import {
+  NetworksChainId,
+  MAINNET,
+  NetworkType,
+} from '@metamask/controller-utils';
 import { PreferencesController } from '@metamask/preferences-controller';
 import { ControllerMessenger } from '@metamask/base-controller';
 import { TokensController } from './TokensController';
@@ -94,26 +99,6 @@ const getControllerMessenger = (): MainControllerMessenger => {
   return new ControllerMessenger();
 };
 
-const setupNetworkController = (
-  controllerMessenger: MainControllerMessenger,
-) => {
-  const networkMessenger = controllerMessenger.getRestricted({
-    name: 'NetworkController',
-    allowedEvents: [
-      'NetworkController:providerConfigChange',
-      'NetworkController:stateChange',
-    ],
-    allowedActions: [],
-  });
-
-  const network = new NetworkController({
-    messenger: networkMessenger,
-    infuraProjectId: '123',
-  });
-
-  return { network, networkMessenger };
-};
-
 const setupTokenListController = (
   controllerMessenger: MainControllerMessenger,
 ) => {
@@ -138,8 +123,6 @@ const setupTokenListController = (
 describe('TokenDetectionController', () => {
   let tokenDetection: TokenDetectionController;
   let preferences: PreferencesController;
-  let network: NetworkController;
-  let networkMessenger: NetworkControllerMessenger;
   let tokensController: TokensController;
   let tokenList: TokenListController;
   let controllerMessenger: MainControllerMessenger;
@@ -148,6 +131,20 @@ describe('TokenDetectionController', () => {
     ReturnType<AssetsContractController['getBalancesInSingleCall']>
   >;
 
+  const onNetworkStateChangeListeners: ((state: NetworkState) => void)[] = [];
+  const changeNetwork = (providerConfig: ProviderConfig) => {
+    onNetworkStateChangeListeners.forEach((listener) => {
+      listener({
+        ...defaultNetworkState,
+        providerConfig,
+      });
+    });
+  };
+  const mainnet = {
+    chainId: NetworksChainId.mainnet,
+    type: MAINNET as NetworkType,
+  };
+
   beforeEach(async () => {
     nock(TOKEN_END_POINT_API)
       .get(`/tokens/${NetworksChainId.mainnet}`)
@@ -164,14 +161,16 @@ describe('TokenDetectionController', () => {
 
     preferences = new PreferencesController({}, { useTokenDetection: true });
     controllerMessenger = getControllerMessenger();
-    const networkSetup = setupNetworkController(controllerMessenger);
-    network = networkSetup.network;
-    networkMessenger = networkSetup.networkMessenger;
+    sinon
+      .stub(TokensController.prototype, '_instantiateNewEthersProvider')
+      .callsFake(() => null);
+
     tokensController = new TokensController({
       onPreferencesStateChange: (listener) => preferences.subscribe(listener),
       onNetworkStateChange: (listener) =>
-        networkMessenger.subscribe('NetworkController:stateChange', listener),
+        onNetworkStateChangeListeners.push(listener),
     });
+
     const tokenListSetup = setupTokenListController(controllerMessenger);
     tokenList = tokenListSetup.tokenList;
     await tokenList.start();
@@ -179,7 +178,7 @@ describe('TokenDetectionController', () => {
     tokenDetection = new TokenDetectionController({
       onPreferencesStateChange: (listener) => preferences.subscribe(listener),
       onNetworkStateChange: (listener) =>
-        networkMessenger.subscribe('NetworkController:stateChange', listener),
+        onNetworkStateChangeListeners.push(listener),
       onTokenListStateChange: (listener) =>
         tokenListSetup.tokenListMessenger.subscribe(
           `TokenListController:stateChange`,
@@ -191,7 +190,7 @@ describe('TokenDetectionController', () => {
         tokensController.addDetectedTokens.bind(tokensController),
       getTokensState: () => tokensController.state,
       getTokenListState: () => tokenList.state,
-      getNetworkState: () => network.state,
+      getNetworkState: () => defaultNetworkState,
       getPreferencesState: () => preferences.state,
     });
 
@@ -270,12 +269,8 @@ describe('TokenDetectionController', () => {
   });
 
   it('should detect tokens correctly on supported networks', async () => {
-    sinon
-      .stub(tokensController, '_instantiateNewEthersProvider')
-      .callsFake(() => null);
-
     preferences.update({ selectedAddress: '0x1' });
-    network.setProviderType(MAINNET);
+    changeNetwork(mainnet);
 
     getBalancesInSingleCall.resolves({
       [sampleTokenA.address]: new BN(1),
@@ -285,12 +280,8 @@ describe('TokenDetectionController', () => {
   });
 
   it('should update detectedTokens when new tokens are detected', async () => {
-    sinon
-      .stub(tokensController, '_instantiateNewEthersProvider')
-      .callsFake(() => null);
-
     preferences.update({ selectedAddress: '0x1' });
-    network.setProviderType(MAINNET);
+    changeNetwork(mainnet);
 
     await tokenDetection.start();
 
@@ -311,13 +302,9 @@ describe('TokenDetectionController', () => {
   });
 
   it('should not add ignoredTokens to the tokens list if detected with balance', async () => {
-    sinon
-      .stub(tokensController, '_instantiateNewEthersProvider')
-      .callsFake(() => null);
-
     preferences.setSelectedAddress('0x0001');
 
-    network.setProviderType('mainnet');
+    changeNetwork(mainnet);
 
     await tokenDetection.start();
 
@@ -347,12 +334,8 @@ describe('TokenDetectionController', () => {
   });
 
   it('should add a token when detected with a balance even if it is ignored on another account', async () => {
-    sinon
-      .stub(tokensController, '_instantiateNewEthersProvider')
-      .callsFake(() => null);
-
     preferences.setSelectedAddress('0x0001');
-    network.setProviderType('mainnet');
+    changeNetwork(mainnet);
 
     await tokenDetection.start();
 
@@ -374,12 +357,8 @@ describe('TokenDetectionController', () => {
   });
 
   it('should not autodetect tokens that exist in the ignoreList', async () => {
-    sinon
-      .stub(tokensController, '_instantiateNewEthersProvider')
-      .callsFake(() => null);
-
     preferences.update({ selectedAddress: '0x1' });
-    network.setProviderType(MAINNET);
+    changeNetwork(mainnet);
 
     await tokenDetection.start();
 
@@ -405,12 +384,8 @@ describe('TokenDetectionController', () => {
   });
 
   it('should detect new tokens after switching between accounts', async () => {
-    sinon
-      .stub(tokensController, '_instantiateNewEthersProvider')
-      .callsFake(() => null);
-
     preferences.setSelectedAddress('0x0001');
-    network.setProviderType(MAINNET);
+    changeNetwork(mainnet);
 
     getBalancesInSingleCall.resolves({
       [sampleTokenA.address]: new BN(1),
@@ -429,9 +404,6 @@ describe('TokenDetectionController', () => {
       .get(`/tokens/${polygonDecimalChainId}`)
       .reply(200, sampleTokenList);
 
-    sinon
-      .stub(tokensController, '_instantiateNewEthersProvider')
-      .callsFake(() => null);
     const stub = sinon.stub();
     const getBalancesInSingleCallMock = sinon.stub();
     let networkStateChangeListener: (state: any) => void;
@@ -448,7 +420,7 @@ describe('TokenDetectionController', () => {
         addDetectedTokens: stub,
         getTokensState: () => tokensController.state,
         getTokenListState: () => tokenList.state,
-        getNetworkState: () => network.state,
+        getNetworkState: () => defaultNetworkState,
         getPreferencesState: () => preferences.state,
       },
       {
@@ -490,7 +462,7 @@ describe('TokenDetectionController', () => {
         addDetectedTokens: stub,
         getTokensState: stub,
         getTokenListState: stub,
-        getNetworkState: () => network.state,
+        getNetworkState: () => defaultNetworkState,
         getPreferencesState: () => preferences.state,
       },
       {
@@ -522,7 +494,7 @@ describe('TokenDetectionController', () => {
         addDetectedTokens: stub,
         getTokensState: () => tokensController.state,
         getTokenListState: () => tokenList.state,
-        getNetworkState: () => network.state,
+        getNetworkState: () => defaultNetworkState,
         getPreferencesState: () => preferences.state,
       },
       {
@@ -558,7 +530,7 @@ describe('TokenDetectionController', () => {
         addDetectedTokens: stub,
         getTokensState: () => tokensController.state,
         getTokenListState: () => tokenList.state,
-        getNetworkState: () => network.state,
+        getNetworkState: () => defaultNetworkState,
         getPreferencesState: () => preferences.state,
       },
       {
diff --git a/packages/network-controller/src/NetworkController.ts b/packages/network-controller/src/NetworkController.ts
index 4ae5bd0c394..98d342798eb 100644
--- a/packages/network-controller/src/NetworkController.ts
+++ b/packages/network-controller/src/NetworkController.ts
@@ -98,7 +98,7 @@ export type NetworkControllerOptions = {
   state?: Partial<NetworkState>;
 };
 
-const defaultState: NetworkState = {
+export const defaultState: NetworkState = {
   network: 'loading',
   isCustomNetwork: false,
   providerConfig: { type: MAINNET, chainId: NetworksChainId.mainnet },