diff --git a/rolluptool/src/classes/RollupScheduledCalculateControllerTest.cls b/rolluptool/src/classes/RollupScheduledCalculateControllerTest.cls
index 982fef6b..982af3a5 100644
--- a/rolluptool/src/classes/RollupScheduledCalculateControllerTest.cls
+++ b/rolluptool/src/classes/RollupScheduledCalculateControllerTest.cls
@@ -30,6 +30,10 @@ private class RollupScheduledCalculateControllerTest {
 	@IsTest
 	private static void testCronHelperDefault() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		// Between Task and Account
 		LookupRollupSummary__c rollupSummaryAccount = new LookupRollupSummary__c();
 		rollupSummaryAccount.Name = 'Test Rollup';
@@ -61,6 +65,10 @@ private class RollupScheduledCalculateControllerTest {
     @IsTest
     private static void testCronHelperDefaultWithUniqueName() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
         // Between Task and Account
         LookupRollupSummary__c rollupSummaryAccount = new LookupRollupSummary__c();
         rollupSummaryAccount.Name = 'Test Rollup';
@@ -93,6 +101,10 @@ private class RollupScheduledCalculateControllerTest {
 	@IsTest
 	private static void testCronHelperError() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		// Between Task and Account
 		LookupRollupSummary__c rollupSummaryAccount = new LookupRollupSummary__c();
 		rollupSummaryAccount.Name = 'Test Rollup';
@@ -126,6 +138,10 @@ private class RollupScheduledCalculateControllerTest {
 	@IsTest
 	private static void testCronHelperCustomised() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		// Between Task and Account
 		LookupRollupSummary__c rollupSummaryAccount = new LookupRollupSummary__c();
 		rollupSummaryAccount.Name = 'Test Rollup';
diff --git a/rolluptool/src/classes/RollupServiceTest5.cls b/rolluptool/src/classes/RollupServiceTest5.cls
index 50ff1b85..02e80528 100644
--- a/rolluptool/src/classes/RollupServiceTest5.cls
+++ b/rolluptool/src/classes/RollupServiceTest5.cls
@@ -30,6 +30,10 @@ private class RollupServiceTest5 {
 	@IsTest
 	private static void testPolymorphicRelationshipsRealtime() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		// Polymorphic lookup between Task and Account
 		LookupRollupSummary__c rollupSummaryA = new LookupRollupSummary__c();
 		rollupSummaryA.Name = 'Test Rollup';
@@ -86,6 +90,10 @@ private class RollupServiceTest5 {
 	@IsTest
 	private static void testPolymorphicRelationshipsScheduled() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		// Polymorphic lookup between Task and Account
 		LookupRollupSummary__c rollupSummaryAccount = new LookupRollupSummary__c();
 		rollupSummaryAccount.Name = 'Test Rollup';
@@ -149,6 +157,10 @@ private class RollupServiceTest5 {
 	@IsTest
 	private static void testPolymorphicRelationshipsScheduledIgnoreBadScheduleItems() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		// Setup parent test records
 		Account accountParent = new Account(Name = 'Test Account');
 		insert accountParent;
@@ -546,6 +558,10 @@ private class RollupServiceTest5 {
     @IsTest
     private static void testCheckboxRollupWithNoChildren() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
         // Lookup between Task and Opportunity
         LookupRollupSummary__c rollupSummaryOpp = new LookupRollupSummary__c();
         rollupSummaryOpp.Name = 'Test Rollup';
diff --git a/rolluptool/src/classes/RollupServiceTest6.cls b/rolluptool/src/classes/RollupServiceTest6.cls
index 97d0ff71..86696423 100644
--- a/rolluptool/src/classes/RollupServiceTest6.cls
+++ b/rolluptool/src/classes/RollupServiceTest6.cls
@@ -33,6 +33,10 @@ private class RollupServiceTest6 {
     @IsTest  
     private static void testAccountHierarchySumNumberOfEmployees() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
         LookupRollupSummary__c rollupSummaryA = new LookupRollupSummary__c();
         rollupSummaryA.Name = 'Test Rollup';
         rollupSummaryA.ParentObject__c = 'Account';
@@ -121,6 +125,10 @@ private class RollupServiceTest6 {
     @IsTest
     private static void testParentIdsVaryOnlyByCaseTolerated() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
         // Between Task and Account
         LookupRollupSummary__c rollupSummaryAccount = new LookupRollupSummary__c();
         rollupSummaryAccount.Name = 'Test Rollup';
@@ -163,6 +171,10 @@ private class RollupServiceTest6 {
 	@IsTest
 	private static void testHistoricBeforeV2ScheduleItemsAreTolerated() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		// Setup parent test records
 		Account accountParent = new Account(Name = 'Test Account');
 		insert accountParent;
@@ -227,6 +239,10 @@ private class RollupServiceTest6 {
 	@IsTest	 
 	private static void selfRollupInsert() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		LookupRollupSummary__c rollupSummaryA = new LookupRollupSummary__c();
 		rollupSummaryA.Name = 'Test Rollup';
 		rollupSummaryA.ParentObject__c = 'Opportunity';
@@ -257,6 +273,10 @@ private class RollupServiceTest6 {
 	@IsTest	 
 	private static void selfRollupDelete() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		LookupRollupSummary__c rollupSummaryA = new LookupRollupSummary__c();
 		rollupSummaryA.Name = 'Test Rollup';
 		rollupSummaryA.ParentObject__c = 'Opportunity';
@@ -383,6 +403,10 @@ private class RollupServiceTest6 {
 	@IsTest
 	private static void testAccountMergeAsParent() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		LookupRollupSummary__c rollupSummaryA = new LookupRollupSummary__c();
 		rollupSummaryA.Name = 'Test Rollup';
 		rollupSummaryA.ParentObject__c = 'Account';
@@ -442,6 +466,10 @@ private class RollupServiceTest6 {
 	@IsTest
 	private static void testAccountMergeAsParentWithoutParentTriggerDeployed() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		LookupRollupSummary__c rollupSummaryA = new LookupRollupSummary__c();
 		rollupSummaryA.Name = 'Test Rollup';
 		rollupSummaryA.ParentObject__c = 'Account';
@@ -497,6 +525,10 @@ private class RollupServiceTest6 {
 	@IsTest
 	private static void testContactMergeAsChild() {
 
+        // Test supported?
+        if(!TestContext.isSupported())
+            return;
+
 		LookupRollupSummary__c rollupSummaryA = new LookupRollupSummary__c();
 		rollupSummaryA.Name = 'Total Opportunities greater than 200 into Annual Revenue on Account';
 		rollupSummaryA.ParentObject__c = 'Account';