diff --git a/ooniprobe/Test/Suite/AbstractSuite.h b/ooniprobe/Test/Suite/AbstractSuite.h
index 748da021..3981cbf6 100644
--- a/ooniprobe/Test/Suite/AbstractSuite.h
+++ b/ooniprobe/Test/Suite/AbstractSuite.h
@@ -15,6 +15,7 @@
 @property (nonatomic) UIBackgroundTaskIdentifier backgroundTask;
 @property BOOL interrupted;
 @property BOOL storeDB;
+@property BOOL autoRUn;
 @property float totalTests;
 
 -(id)initSuite:(NSString*)testSuite;
diff --git a/ooniprobe/Test/Suite/ExperimentalSuite.m b/ooniprobe/Test/Suite/ExperimentalSuite.m
index c52d8be6..d0bee1c0 100644
--- a/ooniprobe/Test/Suite/ExperimentalSuite.m
+++ b/ooniprobe/Test/Suite/ExperimentalSuite.m
@@ -11,12 +11,14 @@ -(id) init {
     return self;
 }
 
-- (NSArray*)getTestList {
-    if ([self.testList count] == 0){
+- (NSArray *)getTestList {
+    if ([self.testList count] == 0) {
+        if (self.autoRUn) {
+            [self.testList addObject:[[Experimental alloc] initWithName:@"torsf"]];
+            [self.testList addObject:[[Experimental alloc] initWithName:@"vanilla_tor"]];
+        }
         [self.testList addObject:[[Experimental alloc] initWithName:@"stunreachability"]];
         [self.testList addObject:[[Experimental alloc] initWithName:@"dnscheck"]];
-        [self.testList addObject:[[Experimental alloc] initWithName:@"torsf"]];
-        [self.testList addObject:[[Experimental alloc] initWithName:@"vanilla_tor"]];
     }
     return super.getTestList;
 }
diff --git a/ooniprobe/Utility/BackgroundTask.m b/ooniprobe/Utility/BackgroundTask.m
index 2c47bb91..8d72d259 100644
--- a/ooniprobe/Utility/BackgroundTask.m
+++ b/ooniprobe/Utility/BackgroundTask.m
@@ -99,6 +99,10 @@ + (void)checkIn {
     CircumventionSuite *cTest = [[CircumventionSuite alloc] init];
     [cTest setStoreDB:NO];
     [tests addObject:cTest];
+    ExperimentalSuite *eTest = [[ExperimentalSuite alloc] init];
+    [eTest setStoreDB:NO];
+    [eTest setAutoRUn:YES];
+    [tests addObject:eTest];
     [[RunningTest currentTest] setAndRun:[NSMutableArray arrayWithArray:tests]  inView: nil];
 }