diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 307e997909..0000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Java Gradle CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-java/ for more details
-#
-version: 2
-jobs:
-    build:
-        docker:
-            # specify the version you desire here
-            - image: circleci/openjdk:8-jdk
-
-            # Specify service dependencies here if necessary
-            # CircleCI maintains a library of pre-built images
-            # documented at https://circleci.com/docs/2.0/circleci-images/
-            # - image: circleci/postgres:9.4
-
-        working_directory: ~/repo
-
-        environment:
-            # Customize the JVM maximum heap limit
-            JVM_OPTS: -Xmx3200m
-            TERM: dumb
-
-        steps:
-            - checkout
diff --git a/build.gradle b/build.gradle
index ed3a4da988..8452bb1ad7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -152,11 +152,6 @@ task buildCore(dependsOn: [':gateway-service:build', ':discovery-service:build',
     group "build"
 }
 
-task runIntegrationTests(dependsOn: ":integration-tests:runIntegrationTests") {
-    description "Run integration tests"
-    group "Integration tests"
-}
-
 task runAllIntegrationTests(dependsOn: ":integration-tests:runAllIntegrationTests") {
     description "Run all integration tests"
     group "Integration tests"
@@ -207,11 +202,6 @@ task runIdPrefixReplacerTests(dependsOn: [":integration-tests:runIdPrefixReplace
     group "Integration tests"
 }
 
-task runMainFrameTests(dependsOn: ":integration-tests:runMainFrameTests") {
-    description "Run only tests related to the MainFrame"
-    group "Integration tests"
-}
-
 task publishAllVersions {
     group 'Zowe Publishing'
     description 'Publish ZIP file and SDK libraries to Zowe Artifactory'
@@ -234,10 +224,7 @@ task runBaseTests(dependsOn: ":integration-tests:runBaseTests") {
     description "Run base tests"
     group "Integration tests"
 }
-task runSafAuthTest(dependsOn: ":integration-tests:runSafAuthTest") {
-    description "Run SAF dependant authentication tests only"
-    group "Integration tests"
-}
+
 task runZosmfAuthTest(dependsOn: ":integration-tests:runZosmfAuthTest") {
     description "Run zOSMF dependant authentication tests only"
     group "Integration tests"
@@ -246,10 +233,7 @@ task runZaasTest(dependsOn: ":integration-tests:runZaasTest") {
     description "Run Zaas dependant authentication tests only"
     group "Integration tests"
 }
-task runX509AuthTest(dependsOn: ":integration-tests:runX509AuthTest") {
-    description "Run x509 dependant authentication tests only"
-    group "Integration tests"
-}
+
 task runBaseTestsInternalPort(dependsOn: ":integration-tests:runBaseTestsInternalPort") {
     description "Run base tests on internal port"
     group "Integration tests"
diff --git a/integration-tests/README.md b/integration-tests/README.md
index 054fe37c32..3f26fee4e8 100644
--- a/integration-tests/README.md
+++ b/integration-tests/README.md
@@ -128,7 +128,7 @@ Start the suite of slow tests by executing the following shell script:
 ## Running a Specific Test
 
 ```sh
-./gradlew :integration-tests:runIntegrationTests --tests org.zowe.apiml.gatewayservice.PassTicketTest
+./gradlew :integration-tests:runAllIntegrationTests --tests org.zowe.apiml.gatewayservice.PassTicketTest
 ```
 
 ## Running specific tests to test Zowe RC
diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle
index c25f7d1703..cde3b7ae45 100644
--- a/integration-tests/build.gradle
+++ b/integration-tests/build.gradle
@@ -112,37 +112,6 @@ task runStartUpCheck(type: Test) {
     outputs.upToDateWhen { false }
 }
 
-task runWebsocketTests(type: Test) {
-    group "integration tests"
-    description "Runs tests for WebSockets"
-
-    systemProperties System.properties
-    useJUnitPlatform {
-        includeTags 'WebsocketTest'
-    }
-    outputs.upToDateWhen { false }
-}
-
-task runIntegrationTests(type: Test) {
-    group "Integration tests"
-    description "Run only tests without long tests"
-
-    dependsOn startUpCheck
-    systemProperties System.properties
-    useJUnitPlatform {
-        excludeTags(
-            'StartupCheck',
-            'EnvironmentCheck',
-            'SlowTests',
-            'AdditionalLocalTest',
-            'HATest',
-            'ChaoticHATest',
-            'OktaOauth2Test',
-            'MultipleRegistrationsTest'
-        )
-    }
-}
-
 task runLocalIntegrationTests(type: Test) {
     group "Integration tests"
     description "Run integration tests that are not dependent on mainframe"
@@ -165,27 +134,6 @@ task runLocalIntegrationTests(type: Test) {
     outputs.upToDateWhen { false }
 }
 
-task runAllLocalIntegrationTests(type: Test) {
-    group "Integration tests"
-    description "Run integration tests for additional local services"
-
-    dependsOn startUpCheck
-    systemProperties System.getProperties()
-    useJUnitPlatform {
-        excludeTags(
-            'StartupCheck',
-            'EnvironmentCheck',
-            'SlowTests',
-            'MainframeDependentTests',
-            'HATest',
-            'ChaoticHATest',
-            'OktaOauth2Test',
-            'MultipleRegistrationsTest'
-        )
-    }
-    outputs.upToDateWhen { false }
-}
-
 task runAllIntegrationTestsNormal(type: Test) {
     group "Integration tests"
     description "Run all integration tests normal"
@@ -227,22 +175,13 @@ task runAllIntegrationTests(type: Test) {
     outputs.upToDateWhen { false }
 }
 
-task runTestWithoutStartupCheck(type: Test) {
-    group "Integration tests"
-    description "Run integration test without startup check"
-
-    useJUnitPlatform()
-
-    systemProperties System.properties
-
-    outputs.upToDateWhen { false }
-}
-
 task runAllIntegrationTestsForZoweTesting(type: Test) {
     group "Integration tests"
     description "Run all integration tests for Zowe testing"
 
+    systemProperty "environment.offPlatform", "true"
     systemProperties System.properties
+
     useJUnitPlatform {
         excludeTags(
             'StartupCheck',
@@ -319,21 +258,6 @@ task runContainerTests(type: Test) {
     }
 }
 
-task runMainFrameTests(type: Test) {
-    group "integration tests"
-    description "Run tests that verify integration with MainFrame"
-
-    dependsOn startUpCheck
-    systemProperties System.getProperties()
-    useJUnitPlatform {
-        includeTags(
-            'MainframeDependentTests'
-        )
-    }
-    outputs.upToDateWhen { false }
-}
-
-
 task runBaseTests(type: Test) {
     group "integration tests"
     description "Run base tests"
@@ -453,20 +377,6 @@ task runIdPrefixReplacerTests(type: Test) {
     }
 }
 
-task runSafAuthTest(type: Test) {
-    group "integration tests"
-    description "Run SAF dependant authentication tests only"
-
-    outputs.cacheIf { false }
-
-    systemProperties System.getProperties()
-    useJUnitPlatform {
-        includeTags(
-            'SAFAuthTest'
-        )
-    }
-}
-
 task runZosmfAuthTest(type: Test) {
     group "integration tests"
     description "Run zOSMF dependant authentication tests only"
@@ -498,20 +408,6 @@ task runZaasTest(type: Test) {
     }
 }
 
-task runX509AuthTest(type: Test) {
-    group "integration tests"
-    description "Run x509 dependant authentication tests only"
-
-    outputs.cacheIf { false }
-
-    systemProperties System.getProperties()
-    useJUnitPlatform {
-        includeTags(
-            'X509Test'
-        )
-    }
-}
-
 task runCachingServiceTests(type: Test) {
     group "integration tests"
     description "Run Caching service tests only"