diff --git a/core/service-test-runner/icedfrisby-shields.js b/core/service-test-runner/icedfrisby-shields.js
index 947b7f2eb0..b6ab1dff0e 100644
--- a/core/service-test-runner/icedfrisby-shields.js
+++ b/core/service-test-runner/icedfrisby-shields.js
@@ -19,6 +19,7 @@ const factory = superclass =>
     constructor(message) {
       super(message)
       this.intercepted = false
+      super.networkOn()
     }
 
     get(uri, options = { followRedirect: false }) {
@@ -31,6 +32,7 @@ const factory = superclass =>
 
     intercept(setup) {
       super.intercept(setup)
+      super.networkOff()
       this.intercepted = true
       return this
     }
diff --git a/package-lock.json b/package-lock.json
index f9e5bd08e2..39fbfc5fab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -114,7 +114,7 @@
         "humanize-string": "^2.1.0",
         "husky": "^4.3.8",
         "icedfrisby": "4.0.0",
-        "icedfrisby-nock": "^2.0.0",
+        "icedfrisby-nock": "^2.1.0",
         "is-svg": "^4.3.1",
         "js-yaml-loader": "^1.2.2",
         "jsdoc": "^3.6.7",
@@ -16342,10 +16342,14 @@
       }
     },
     "node_modules/icedfrisby-nock": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/icedfrisby-nock/-/icedfrisby-nock-2.0.0.tgz",
-      "integrity": "sha512-Yl0XmxqXgvjcqLpA8MhWKVQQHeuPB2Nrl1NLG0DoTp8FI0qIWOCal8xEZ7zBY5RSgCL83TX0vPyBOX9dR1G4zQ==",
-      "dev": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/icedfrisby-nock/-/icedfrisby-nock-2.1.0.tgz",
+      "integrity": "sha512-kllF0451KHKkrwb5Em8KXA0i9ncAnezfidvgVi1sBuA8ClDorZ8A+rdr61dgcXZlo/MEWHeJIR5e0wVB/mxthA==",
+      "dev": true,
+      "peerDependencies": {
+        "icedfrisby": ">= 2.2.0",
+        "nock": "*"
+      }
     },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
@@ -44304,10 +44308,11 @@
       }
     },
     "icedfrisby-nock": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/icedfrisby-nock/-/icedfrisby-nock-2.0.0.tgz",
-      "integrity": "sha512-Yl0XmxqXgvjcqLpA8MhWKVQQHeuPB2Nrl1NLG0DoTp8FI0qIWOCal8xEZ7zBY5RSgCL83TX0vPyBOX9dR1G4zQ==",
-      "dev": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/icedfrisby-nock/-/icedfrisby-nock-2.1.0.tgz",
+      "integrity": "sha512-kllF0451KHKkrwb5Em8KXA0i9ncAnezfidvgVi1sBuA8ClDorZ8A+rdr61dgcXZlo/MEWHeJIR5e0wVB/mxthA==",
+      "dev": true,
+      "requires": {}
     },
     "iconv-lite": {
       "version": "0.4.24",
diff --git a/package.json b/package.json
index bf8d8af622..9928e79469 100644
--- a/package.json
+++ b/package.json
@@ -201,7 +201,7 @@
     "humanize-string": "^2.1.0",
     "husky": "^4.3.8",
     "icedfrisby": "4.0.0",
-    "icedfrisby-nock": "^2.0.0",
+    "icedfrisby-nock": "^2.1.0",
     "is-svg": "^4.3.1",
     "js-yaml-loader": "^1.2.2",
     "jsdoc": "^3.6.7",