diff --git a/db/manifest b/db/manifest
index 267d3a46f..a3e90a8e6 100755
--- a/db/manifest
+++ b/db/manifest
@@ -261,4 +261,4 @@ add_jam_track_bitrates.sql
 jam_track_importer.sql
 jam_track_pro_licensing_update.sql
 jam_track_redeemed.sql
-connection_metronome.sql
\ No newline at end of file
+connection_metronome.sql
diff --git a/web/app/assets/javascripts/networkTestHelper.js b/web/app/assets/javascripts/networkTestHelper.js
index c295f1123..61273a2db 100644
--- a/web/app/assets/javascripts/networkTestHelper.js
+++ b/web/app/assets/javascripts/networkTestHelper.js
@@ -26,6 +26,7 @@
     var TEST_TIMEOUT_CALLBACK = 'JK.HandleNetworkTestTimeout';
 
     var $startNetworkTestBtn = null;
+    var $foreverNetworkTestBtn = null;
     var $testResults = null;
     var $testScore = null;
     var $testText = null;
@@ -51,6 +52,8 @@
     var operatingSystem = null;
     var PRIME_PUMP_TIME = 1;
 
+    var forever = false;
+
     // these try to make it such that we only pass a NetworkTest Pass/Failed one time in a new user flow
     var trackedPass = false;
     var lastNetworkFailure = null;
@@ -313,6 +316,9 @@
 
       if (success) {
         $self.triggerHandler(NETWORK_TEST_DONE)
+        if(forever) {
+          prepareNetworkTest();
+        }
       }
       else {
         $self.triggerHandler(NETWORK_TEST_FAIL)
@@ -875,6 +881,7 @@
       inGearWizard = _inGearWizard;
 
       $startNetworkTestBtn = $step.find('.start-network-test');
+      $foreverNetworkTestBtn = $step.find('.forever-network-test')
 
       if ($startNetworkTestBtn.length == 0) throw 'no start network test button found in network-test'
 
@@ -889,8 +896,16 @@
       $subscore = $step.find('.subscore');
       $watchVideo = $step.find('.watch-video');
       $startNetworkTestBtn.on('click', function () {
+        forever = false;
         prepareNetworkTest();
       });
+      if(context.JK.currentUserAdmin) {
+        $foreverNetworkTestBtn.on('click', function() {
+          forever = true;
+          prepareNetworkTest();
+        }).show();
+      }
+
       operatingSystem = context.JK.GetOSAsString();
 
       initializeVideoWatchButton();
diff --git a/web/app/assets/stylesheets/client/wizard/gearWizard.css.scss b/web/app/assets/stylesheets/client/wizard/gearWizard.css.scss
index 29d498f69..b21005cd3 100644
--- a/web/app/assets/stylesheets/client/wizard/gearWizard.css.scss
+++ b/web/app/assets/stylesheets/client/wizard/gearWizard.css.scss
@@ -342,6 +342,10 @@
       margin-top: 20px;
     }
 
+    a.forever-network-test {
+      display:none;
+    }
+
     .network-test-score {
       height: 24px;
       padding: 10px;
diff --git a/web/app/views/clients/_network_test.html.haml b/web/app/views/clients/_network_test.html.haml
index a61e4e081..35b28ea6f 100644
--- a/web/app/views/clients/_network_test.html.haml
+++ b/web/app/views/clients/_network_test.html.haml
@@ -16,6 +16,7 @@
         %p Then click on the Start Network Test button below.
         .center
           %a.button-orange.start-network-test{href:'#'} START NETWORK TEST
+          %a.button-orange.forever-network-test{href:'#'} FOREVER NETWORK TEST
     .wizard-step-column
       %h2 Test Results
       .network-test-results.ftue-box