diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ApplicationsIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ApplicationsIT.groovy
index 4c48d4b384a..735e265c5b9 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ApplicationsIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ApplicationsIT.groovy
@@ -103,12 +103,12 @@ class ApplicationsIT extends ITSupport {
         }
     }
 
-    @Test
+    @Test (groups = "group1")
     void testClientIsReady() {
         assertThat "Expected client to be ready", client.isReady({ -> client.listApplications() })
     }
 
-    @Test
+    @Test (groups = "group1")
     void basicListTest() {
         // Create a resource
         def resource = create(client, client.instantiate(AutoLoginApplication)
@@ -136,7 +136,7 @@ class ApplicationsIT extends ITSupport {
         assertThat "New resource with id ${resource.getId()} was not found in list resource.", optional.isPresent()
     }
 
-    @Test
+    @Test (groups = "group1")
     void crudOpenIdConnect() {
         doCrudTest(client.instantiate(OpenIdConnectApplication)
                         .setSettings(client.instantiate(OpenIdConnectApplicationSettings)
@@ -160,7 +160,7 @@ class ApplicationsIT extends ITSupport {
                                 .setTokenEndpointAuthMethod(OAuthEndpointAuthenticationMethod.CLIENT_SECRET_POST))))
     }
 
-    @Test
+    @Test (groups = "group1")
     void crudAutoLogin() {
         doCrudTest(client.instantiate(AutoLoginApplication)
                         .setVisibility(client.instantiate(ApplicationVisibility)
@@ -193,7 +193,7 @@ class ApplicationsIT extends ITSupport {
                                 .setUsernameAttribute("username"))))
     }
 
-    @Test
+    @Test (groups = "group1")
     void crudSaml20() {
 
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
@@ -244,7 +244,7 @@ class ApplicationsIT extends ITSupport {
                                                 .setValues(["Value"])])))))
     }
 
-    @Test
+    @Test (groups = "group1")
     void crudSecurePasswordStore() {
         doCrudTest(client.instantiate(SecurePasswordStoreApplication)
                         .setSettings(client.instantiate(SecurePasswordStoreApplicationSettings)
@@ -260,7 +260,7 @@ class ApplicationsIT extends ITSupport {
                                 .setOptionalField3Value("finalvalue"))))
     }
 
-    @Test
+    @Test (groups = "group1")
     void crudBrowserPlugin() {
         doCrudTest(client.instantiate(SwaApplication)
                         .setLabel(uniqueTestName)
@@ -273,7 +273,7 @@ class ApplicationsIT extends ITSupport {
 //                                        .setLoginUrlRegex("REGEX_EXPRESSION"))
     }
 
-    @Test
+    @Test (groups = "group1")
     void crudBasicAuth() {
         doCrudTest(client.instantiate(BasicAuthApplication)
                         .setSettings(client.instantiate(BasicApplicationSettings)
@@ -282,7 +282,7 @@ class ApplicationsIT extends ITSupport {
                                 .setUrl("https://example.com/login.html"))))
     }
 
-    @Test
+    @Test (groups = "group1")
     void crudBasicAuth_editUsernameAndPassword() {
         doCrudTest(client.instantiate(BasicAuthApplication)
                         .setCredentials(client.instantiate(SchemeApplicationCredentials)
@@ -293,7 +293,7 @@ class ApplicationsIT extends ITSupport {
                                 .setUrl("https://example.com/login.html"))))
     }
 
-    @Test
+    @Test (groups = "group1")
     void crudBasicAuth_adminSetsCredentials() {
         doCrudTest(client.instantiate(BasicAuthApplication)
                         .setCredentials(client.instantiate(SchemeApplicationCredentials)
@@ -305,7 +305,7 @@ class ApplicationsIT extends ITSupport {
                                 .setUrl("https://example.com/login.html"))))
     }
 
-    @Test
+    @Test (groups = "group1")
     void invalidApplicationCredentialsSchemeTest() {
         expect(IllegalArgumentException, {
             client.instantiate(BasicAuthApplication)
@@ -319,7 +319,7 @@ class ApplicationsIT extends ITSupport {
         })
     }
 
-    @Test
+    @Test (groups = "group1")
     void invalidOAuthEndpointAuthenticationMethodTest() {
         expect(IllegalArgumentException ,{client.instantiate(OpenIdConnectApplication)
             .setSettings(client.instantiate(OpenIdConnectApplicationSettings)
@@ -343,7 +343,7 @@ class ApplicationsIT extends ITSupport {
                     .setTokenEndpointAuthMethod(OAuthEndpointAuthenticationMethod.SDK_UNKNOWN)))})
     }
 
-    @Test
+    @Test (groups = "group1")
     void invalidOAuthResponseTypeTest() {
         expect(IllegalArgumentException ,{client.instantiate(OpenIdConnectApplication)
             .setSettings(client.instantiate(OpenIdConnectApplicationSettings)
@@ -368,7 +368,7 @@ class ApplicationsIT extends ITSupport {
                     .setTokenEndpointAuthMethod(OAuthEndpointAuthenticationMethod.CLIENT_SECRET_POST)))})
     }
 
-    @Test
+    @Test (groups = "group1")
     void invalidOAuthGrantTypeTest() {
         expect(IllegalArgumentException, {client.instantiate(OpenIdConnectApplication)
             .setSettings(client.instantiate(OpenIdConnectApplicationSettings)
@@ -394,7 +394,7 @@ class ApplicationsIT extends ITSupport {
         })
     }
 
-    @Test
+    @Test (groups = "group1")
     void invalidOpenIdConnectApplicationTypeTest() {
         expect(IllegalArgumentException ,{
             client.instantiate(OpenIdConnectApplication)
@@ -420,7 +420,7 @@ class ApplicationsIT extends ITSupport {
         })
     }
 
-    @Test
+    @Test (groups = "group1")
     void crudBookmark() {
         doCrudTest(client.instantiate(BookmarkApplication)
                         .setSettings(client.instantiate(BookmarkApplicationSettings)
@@ -479,7 +479,7 @@ class ApplicationsIT extends ITSupport {
         assertThat(app2Keys.size(), equalTo(2))
     }
 
-    @Test
+    @Test (groups = "group1")
     void deactivateActivateTest() {
         Application app = client.createApplication(client.instantiate(AutoLoginApplication)
                 .setLabel("app-${uniqueTestName}")
@@ -504,7 +504,8 @@ class ApplicationsIT extends ITSupport {
         assertThat(client.getApplication(app.getId()).getStatus(), equalTo(Application.StatusEnum.ACTIVE))
     }
 
-    @Test
+    // Quarantining this till OKTA-421154 is fixed
+    @Test (groups = "bacon")
     void groupAssignmentWithNullBodyTest() {
 
         Application app = client.createApplication(client.instantiate(AutoLoginApplication)
@@ -531,7 +532,7 @@ class ApplicationsIT extends ITSupport {
         assertThat(groupAssignment, notNullValue())
     }
 
-    @Test
+    @Test (groups = "group1")
     void groupAssignmentTest() {
 
         Application app = client.createApplication(client.instantiate(AutoLoginApplication)
@@ -645,7 +646,7 @@ class ApplicationsIT extends ITSupport {
         assertThat readAppUser.getCredentials().getUserName(), equalTo("updated-"+user2.getProfile().getEmail())
     }
 
-    @Test
+    @Test (groups = "group1")
     void csrTest() {
         Client client = getClient()
 
@@ -701,7 +702,8 @@ class ApplicationsIT extends ITSupport {
         assertNotPresent(app.listCsrs(), csr)
     }
 
-    @Test
+    // Quarantining this till OKTA-421154 is fixed
+    @Test (groups = "bacon")
     void oAuth2ScopeConsentGrantTest() {
         Client client = getClient()
 
@@ -747,7 +749,8 @@ class ApplicationsIT extends ITSupport {
         assertNotPresent(app.listScopeConsentGrants(), app.getScopeConsentGrant(oAuth2ScopeConsentGrant.getId()))
     }
 
-    @Test
+    // Quarantining this till OKTA-421154 is fixed
+    @Test (groups = "bacon")
     void testExecuteWithoutAcceptHeader() {
         def app = client.instantiate(SamlApplication)
             .setVisibility(client.instantiate(ApplicationVisibility))
@@ -777,7 +780,7 @@ class ApplicationsIT extends ITSupport {
         assertThat(response.size(), is(3))
     }
 
-    @Test
+    @Test (groups = "group1")
     void testExecuteAcceptIonPlusJson() {
         def app = client.instantiate(SamlApplication)
             .setVisibility(client.instantiate(ApplicationVisibility))
@@ -804,7 +807,7 @@ class ApplicationsIT extends ITSupport {
         assertThat(response.size(), is(3))
     }
 
-    @Test
+    @Test (groups = "group1")
     void testGetRawResponse() {
         def app = client.instantiate(SamlApplication)
             .setVisibility(client.instantiate(ApplicationVisibility))
@@ -838,7 +841,7 @@ class ApplicationsIT extends ITSupport {
         assertThat(x509Certificate.isBlank(), is(false))
     }
 
-    @Test
+    @Test (groups = "group1")
     void getApplicationUserSchemaTest() {
 
         Application createdApp = client.instantiate(AutoLoginApplication)
@@ -869,7 +872,7 @@ class ApplicationsIT extends ITSupport {
         })
     }
 
-    @Test
+    @Test (groups = "group1")
     void updateApplicationUserProfileTest() {
 
         Application createdApp = client.instantiate(AutoLoginApplication)
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/AuthorizationServerIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/AuthorizationServerIT.groovy
index fd9458eef23..9974fff22c5 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/AuthorizationServerIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/AuthorizationServerIT.groovy
@@ -68,7 +68,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(createdAuthorizationServer.getAudiences(), contains("api://example"))
     }
 
-    @Test
+    @Test (groups = "group3")
     void listCreatedAuthorizationServerTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -87,7 +87,7 @@ class AuthorizationServerIT extends ITSupport {
         assertPresent(client.listAuthorizationServers(), createdAuthorizationServer)
     }
 
-    @Test
+    @Test (groups = "group3")
     void getAuthorizationServerTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -106,7 +106,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(retrievedAuthorizationServer.getDescription(), equalTo(createdAuthorizationServer.getDescription()))
     }
 
-    @Test
+    @Test (groups = "group3")
     void updateAuthorizationServerTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -126,7 +126,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(updatedAuthorizationServer.getDescription(), equalTo("Updated Test Authorization Server"))
     }
 
-    @Test
+    @Test (groups = "group3")
     void deleteAuthorizationServerTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -149,7 +149,7 @@ class AuthorizationServerIT extends ITSupport {
         assertNotPresent(client.listAuthorizationServers(), createdAuthorizationServer)
     }
 
-    @Test
+    @Test (groups = "group3")
     void deactivateAuthorizationServerTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -174,7 +174,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(retrievedAuthorizationServer.getStatus(), equalTo(AuthorizationServer.StatusEnum.INACTIVE))
     }
 
-    @Test
+    @Test (groups = "group3")
     void activateAuthorizationServerTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -211,7 +211,7 @@ class AuthorizationServerIT extends ITSupport {
 
     // Policy operations
 
-    @Test
+    @Test (groups = "group3")
     void listAuthorizationServerPoliciesTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -224,6 +224,9 @@ class AuthorizationServerIT extends ITSupport {
         registerForCleanup(createdAuthorizationServer)
         assertThat(createdAuthorizationServer, notNullValue())
 
+        // create may not effect immediately in the backend
+        sleep(getTestOperationDelay())
+
         AuthorizationServerList authorizationServerList = client.listAuthorizationServers()
         assertThat(authorizationServerList, notNullValue())
         assertThat(authorizationServerList.size(), greaterThan(0))
@@ -242,7 +245,7 @@ class AuthorizationServerIT extends ITSupport {
             })
     }
 
-    @Test
+    @Test (groups = "group3")
     void createAuthorizationServerPolicyTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -276,7 +279,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(retrievedPolicy.getName(), equalTo(createdPolicy.getName()))
     }
 
-    @Test
+    @Test (groups = "group3")
     void updateAuthorizationServerPolicyTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -313,7 +316,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(updatedPolicy.getDescription(), equalTo("Test Policy Updated"))
     }
 
-    @Test
+    @Test (groups = "group3")
     void deleteAuthorizationServerPolicyTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -348,7 +351,7 @@ class AuthorizationServerIT extends ITSupport {
         assertNotPresent(createdAuthorizationServer.listPolicies(), createdPolicy)
     }
 
-    @Test
+    @Test (groups = "group3")
     void activateDeactivateAuthorizationServerPolicyTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -393,7 +396,7 @@ class AuthorizationServerIT extends ITSupport {
         assertNotPresent(createdAuthorizationServer.listPolicies(), activatedPolicy)
     }
 
-    @Test
+    @Test (groups = "group3")
     void listAuthorizationServerPolicyRulesTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -425,7 +428,7 @@ class AuthorizationServerIT extends ITSupport {
             })
     }
 
-    @Test
+    @Test (groups = "group3")
     void createAuthorizationServerPolicyRuleTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -507,7 +510,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(createdPolicyRule.getActions().getToken().getRefreshTokenWindowMinutes(), equalTo(10080))
     }
 
-    @Test
+    @Test (groups = "group3")
     void updateAuthorizationServerPolicyRuleTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -592,7 +595,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(retrievedPolicyRule.getActions().getToken().getRefreshTokenWindowMinutes(), equalTo(55))
     }
 
-    @Test
+    @Test (groups = "group3")
     void deleteAuthorizationServerPolicyRuleTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -649,7 +652,7 @@ class AuthorizationServerIT extends ITSupport {
         assertNotPresent(createdPolicy.listPolicyRules(createdAuthorizationServer.getId()), createdPolicyRule)
     }
 
-    @Test
+    @Test (groups = "group3")
     void activateDeactivateAuthorizationServerPolicyRuleTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -712,7 +715,7 @@ class AuthorizationServerIT extends ITSupport {
 
     // Scope operations
 
-    @Test
+    @Test (groups = "group3")
     void listOAuth2ScopesTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -734,7 +737,7 @@ class AuthorizationServerIT extends ITSupport {
         assertPresent(createdAuthorizationServer.listOAuth2Scopes(), createdOAuth2Scope)
     }
 
-    @Test
+    @Test (groups = "group3")
     void getOAuth2ScopesTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -759,7 +762,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(retrievedOAuth2Scope.getId(), equalTo(createdOAuth2Scope.getId()))
     }
 
-    @Test
+    @Test (groups = "group3")
     void updateOAuth2ScopesTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -792,7 +795,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(updatedOAuth2Scope.getName(), equalTo(tobeUpdatedOAuth2Scope.getName()))
     }
 
-    @Test
+    @Test (groups = "group3")
     void deleteOAuth2ScopesTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -822,7 +825,7 @@ class AuthorizationServerIT extends ITSupport {
 
     // Claim operations
 
-    @Test
+    @Test (groups = "group3")
     void listOAuth2ClaimsTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -848,7 +851,7 @@ class AuthorizationServerIT extends ITSupport {
         assertPresent(createdAuthorizationServer.listOAuth2Claims(), createdOAuth2Claim)
     }
 
-    @Test
+    @Test (groups = "group3")
     void getOAuth2ClaimTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -876,7 +879,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(retrievedOAuth2Claim.getId(), equalTo(createdOAuth2Claim.getId()))
     }
 
-    @Test
+    @Test (groups = "group3")
     void updateOAuth2ClaimTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -912,7 +915,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(updatedOAuth2Claim.getName(), equalTo(tobeUpdatedOAuth2Claim.getName()))
     }
 
-    @Test
+    @Test (groups = "group3")
     void deleteOAuth2ClaimTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/CrudTestSupport.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/CrudTestSupport.groovy
index 10b482c9159..1a35bae664e 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/CrudTestSupport.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/CrudTestSupport.groovy
@@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.*
  */
 trait CrudTestSupport implements ClientProvider {
 
-    @Test
+    @Test (groups = ["group1"])
     void basicCrudTest() {
 
         Client client = getClient()
@@ -55,7 +55,7 @@ trait CrudTestSupport implements ClientProvider {
         assertDelete(client, resource)
     }
 
-    @Test
+    @Test (groups = ["group1"])
     void basicListTest() {
 
         // Create a resource
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/EventHooksIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/EventHooksIT.groovy
index 9c757432c87..8ff22337bc8 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/EventHooksIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/EventHooksIT.groovy
@@ -38,7 +38,7 @@ import static com.okta.sdk.tests.it.util.Util.assertPresent
  */
 class EventHooksIT extends ITSupport {
 
-    @Test
+    @Test (groups = "group3")
     void createEventHookTest() {
         String name = "java-sdk-it-${UUID.randomUUID().toString()}"
 
@@ -59,7 +59,7 @@ class EventHooksIT extends ITSupport {
         createdEventHook.deactivate()
     }
 
-    @Test
+    @Test (groups = "group3")
     void getEventHookTest() {
         String name = "java-sdk-it-${UUID.randomUUID().toString()}"
 
@@ -84,7 +84,7 @@ class EventHooksIT extends ITSupport {
         createdEventHook.deactivate()
     }
 
-    @Test
+    @Test (groups = "group3")
     void updateEventHookTest() {
         String name = "java-sdk-it-${UUID.randomUUID().toString()}"
 
@@ -118,7 +118,7 @@ class EventHooksIT extends ITSupport {
         createdEventHook.deactivate()
     }
 
-    @Test
+    @Test (groups = "group3")
     void deleteEventHookTest() {
         String name = "java-sdk-it-${UUID.randomUUID().toString()}"
 
@@ -147,7 +147,7 @@ class EventHooksIT extends ITSupport {
         }
     }
 
-    @Test
+    @Test (groups = "group3")
     void listAllEventHooksTest() {
         String name = "java-sdk-it-${UUID.randomUUID().toString()}"
 
@@ -166,7 +166,7 @@ class EventHooksIT extends ITSupport {
         createdEventHook.deactivate()
     }
 
-    @Test
+    @Test (groups = "group3")
     void activateDeactivateEventHookTest() {
         String name = "java-sdk-it-${UUID.randomUUID().toString()}"
 
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/FactorsIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/FactorsIT.groovy
index c3bca932166..26563395896 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/FactorsIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/FactorsIT.groovy
@@ -54,7 +54,7 @@ class FactorsIT extends ITSupport {
 
     private String smsTestNumber = "185 635 15491"
 
-    @Test
+    @Test (groups = "group2")
     void factorListTest() {
 
         Client client = getClient()
@@ -83,7 +83,7 @@ class FactorsIT extends ITSupport {
                 hasProperty("id", is(securityQuestionUserFactor.getId())))))
     }
 
-    @Test
+    @Test (groups = "group2")
     void testSecurityQuestionFactorCreation() {
         Client client = getClient()
         User user = randomUser()
@@ -100,7 +100,7 @@ class FactorsIT extends ITSupport {
         assertThat securityQuestionUserFactor.id, notNullValue()
     }
 
-    @Test
+    @Test (groups = "group2")
     void testCallFactorCreation() {
         Client client = getClient()
         User user = randomUser()
@@ -115,7 +115,7 @@ class FactorsIT extends ITSupport {
         assertThat callUserFactor.id, notNullValue()
     }
 
-    @Test
+    @Test (groups = "group2")
     void testSmsFactorCreation() {
         Client client = getClient()
         User user = randomUser()
@@ -130,7 +130,7 @@ class FactorsIT extends ITSupport {
         assertThat smsUserFactor.id, notNullValue()
     }
 
-    @Test
+    @Test (groups = "group2")
     void testPushFactorCreation() {
         Client client = getClient()
         User user = randomUser()
@@ -142,21 +142,21 @@ class FactorsIT extends ITSupport {
         assertThat pushUserFactor.id, notNullValue()
     }
 
-    @Test
+    @Test (groups = "group2")
     void testListSecurityQuestionsNotEmpty() {
         User user = randomUser()
         SecurityQuestionList securityQuestions = user.listSupportedSecurityQuestions()
         assertThat securityQuestions, iterableWithSize(greaterThan(1))
     }
 
-    @Test
+    @Test (groups = "group2")
     void testAvailableFactorsNotEmpty() {
         User user = randomUser()
         UserFactorList factors = user.listSupportedFactors()
         assertThat factors, iterableWithSize(greaterThan(1))
     }
 
-    @Test
+    @Test (groups = "group2")
     void activateTotpFactor() {
         User user = randomUser()
         assertThat user.listFactors(), emptyIterable()
@@ -173,7 +173,7 @@ class FactorsIT extends ITSupport {
         assertThat factorResult, instanceOf(TotpUserFactor)
     }
 
-    @Test
+    @Test (groups = "group2")
     void verifyQuestionFactor() {
         User user = randomUser()
 
@@ -190,7 +190,7 @@ class FactorsIT extends ITSupport {
         assertThat response.getFactorResult(), is(VerifyUserFactorResponse.FactorResultEnum.SUCCESS)
     }
 
-    @Test
+    @Test (groups = "group2")
     void testEmailUserFactor() {
         User user = randomUser()
         assertThat user.listFactors(), emptyIterable()
@@ -213,7 +213,7 @@ class FactorsIT extends ITSupport {
         assertThat response.getFactorResult(), is(VerifyUserFactorResponse.FactorResultEnum.CHALLENGE)
     }
 
-    @Test
+    @Test (groups = "group2")
     void testGoogleTotpUserFactorCreation() {
         User user = randomUser()
         assertThat user.listFactors(), emptyIterable()
@@ -228,7 +228,7 @@ class FactorsIT extends ITSupport {
         assertThat tokenUserFactor.getStatus(), is(FactorStatus.PENDING_ACTIVATION)
     }
 
-    @Test
+    @Test (groups = "group2")
     void deleteFactorTest() {
 
         User user = randomUser()
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/FeaturesIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/FeaturesIT.groovy
index 6a1a8912965..acb82bfff35 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/FeaturesIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/FeaturesIT.groovy
@@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.*
  */
 class FeaturesIT extends ITSupport {
 
-    @Test
+    @Test (groups = "group2")
     void featureOperationsTest() {
         // list features
         FeatureList featureList = client.listFeatures()
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupRolesIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupRolesIT.groovy
index 9e090ce5960..60597617cd1 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupRolesIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupRolesIT.groovy
@@ -38,7 +38,7 @@ import static com.okta.sdk.tests.it.util.Util.validateGroup
  */
 class GroupRolesIT extends ITSupport {
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("list-roles-assigned-to-group")
     void listRolesAssignedToGroupTest() {
 
@@ -76,7 +76,7 @@ class GroupRolesIT extends ITSupport {
         assertRolePresent(roles, appAdminRole)
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("unassigned-roles-for-group")
     void unassignRoleForGroupTest() {
 
@@ -110,7 +110,7 @@ class GroupRolesIT extends ITSupport {
         assertRoleAbsent(client.listGroupAssignedRoles(createdGroup.getId()), userAdminRole)
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("list-group-targets-for-group")
     void listGroupTargetsForGroupTest() {
 
@@ -145,7 +145,7 @@ class GroupRolesIT extends ITSupport {
         assertGroupPresent(client.listGroupTargetsForGroupRole(createdGroup1.getId(), userAdminRole.getId()), createdGroup2)
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("list-group-targets-for-group")
     void removeGroupTargetFromGroupAdministratorRoleGivenToGroupTest() {
 
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupRulesIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupRulesIT.groovy
index fa8e1767831..336cd0190ae 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupRulesIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupRulesIT.groovy
@@ -88,7 +88,7 @@ class GroupRulesIT implements CrudTestSupport {
         return client.listGroupRules().iterator()
     }
 
-    @Test
+    @Test (groups = "group1")
     @Scenario("group-rule-operations")
     @TestResources(rules = ["Test group rule", "Test group rule updated"])
     void groupRuleCrudTest() {
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupsIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupsIT.groovy
index 4d749612280..eecb7928680 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupsIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupsIT.groovy
@@ -67,7 +67,7 @@ class GroupsIT extends ITSupport implements CrudTestSupport {
         return client.listGroups().iterator()
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("list-groups")
     void listGroupsTest() {
 
@@ -85,7 +85,7 @@ class GroupsIT extends ITSupport implements CrudTestSupport {
         assertGroupPresent(client.listGroups(), createdGroup)
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("search-groups")
     void searchGroupTest() {
 
@@ -102,7 +102,7 @@ class GroupsIT extends ITSupport implements CrudTestSupport {
         assertPresent(client.listGroups(groupName, null, null), group)
     }
 
-    @Test
+    @Test (groups = "bacon")
     @Scenario("search-groups-by-search-parameter")
     void searchGroupsBySearchParameterTest() {
 
@@ -120,7 +120,7 @@ class GroupsIT extends ITSupport implements CrudTestSupport {
         assertPresent(client.listGroups(null, "profile.name eq \"" + groupName + "\"", null), group)
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("update-group")
     void updateGroupTest() {
 
@@ -142,7 +142,7 @@ class GroupsIT extends ITSupport implements CrudTestSupport {
         validateGroup(group, groupNameUpdated, 'Description updated')
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("group-user-operations")
     void groupUserOperationsTest() {
 
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/IdpIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/IdpIT.groovy
index 7bf24931e75..6fd699a87d5 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/IdpIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/IdpIT.groovy
@@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.*
  */
 class IdpIT extends ITSupport {
 
-    @Test
+    @Test (groups = "group2")
     void oidcIdpLifecycleTest() {
 
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
@@ -167,7 +167,7 @@ class IdpIT extends ITSupport {
         assertNotPresent(client.listIdentityProviders(), createdIdp)
     }
 
-    @Test
+    @Test (groups = "group2")
     void oidcIdpUserTest() {
 
         // create user
@@ -238,7 +238,7 @@ class IdpIT extends ITSupport {
         createdIdp.delete()
     }
 
-    @Test
+    @Test (groups = "group2")
     void googleIdpTest() {
 
         // create user
@@ -292,7 +292,7 @@ class IdpIT extends ITSupport {
         assertNotPresent(client.listIdentityProviders(), createdIdp)
     }
 
-    @Test
+    @Test (groups = "group2")
     void facebookIdpTest() {
 
         // create user
@@ -401,7 +401,7 @@ class IdpIT extends ITSupport {
         assertNotPresent(client.listIdentityProviders(), createdIdp)
     }
 
-    @Test
+    @Test (groups = "group2")
     void linkedInIdpTest() {
 
         // create user
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/InlineHooksIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/InlineHooksIT.groovy
index 8c1a502947a..fd30891ef68 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/InlineHooksIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/InlineHooksIT.groovy
@@ -38,7 +38,7 @@ import static com.okta.sdk.tests.it.util.Util.assertNotPresent
  */
 class InlineHooksIT extends ITSupport {
 
-    @Test
+    @Test (groups = "group2")
     void createInlineHookTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -59,7 +59,7 @@ class InlineHooksIT extends ITSupport {
         createdInlineHook.deactivate()
     }
 
-    @Test
+    @Test (groups = "group2")
     void getInlineHookTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -84,7 +84,7 @@ class InlineHooksIT extends ITSupport {
         createdInlineHook.deactivate()
     }
 
-    @Test
+    @Test (groups = "group2")
     void updateInlineHookTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -124,7 +124,7 @@ class InlineHooksIT extends ITSupport {
         updatedInlineHook.deactivate()
     }
 
-    @Test
+    @Test (groups = "group2")
     void deleteInlineHookTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -150,7 +150,7 @@ class InlineHooksIT extends ITSupport {
         assertNotPresent(client.listInlineHooks(), createdInlineHook)
     }
 
-    @Test
+    @Test (groups = "group2")
     void listAllInlineHooksTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
@@ -171,7 +171,7 @@ class InlineHooksIT extends ITSupport {
         createdInlineHook.deactivate()
     }
 
-    @Test
+    @Test (groups = "group2")
     void activateDeactivateInlineHookTest() {
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
 
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/LinkedObjectsIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/LinkedObjectsIT.groovy
index 38aacccb3e3..5efd9e9972d 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/LinkedObjectsIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/LinkedObjectsIT.groovy
@@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.notNullValue
  */
 class LinkedObjectsIT extends ITSupport {
 
-    @Test
+    @Test (groups = "group2")
     void addLinkedObjectDefinitionTest() {
         String primaryName = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(25)
         String associatedName = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(25)
@@ -69,7 +69,7 @@ class LinkedObjectsIT extends ITSupport {
         assertThat(createdLinkedObjectDefinition.getAssociated().getType(), equalTo(LinkedObjectDetailsType.USER))
     }
 
-    @Test
+    @Test (groups = "group2")
     void getLinkedObjectDefinitionByPrimaryNameTest() {
         String primaryName = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(25)
         String associatedName = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(25)
@@ -107,7 +107,7 @@ class LinkedObjectsIT extends ITSupport {
         assertThat(retrievedLinkedObject.getAssociated().getType(), equalTo(LinkedObjectDetailsType.USER))
     }
 
-    @Test
+    @Test (groups = "group2")
     void getLinkedObjectDefinitionByAssociatedNameTest() {
         String primaryName = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(25)
         String associatedName = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(25)
@@ -145,7 +145,7 @@ class LinkedObjectsIT extends ITSupport {
         assertThat(retrievedLinkedObject.getAssociated().getType(), equalTo(LinkedObjectDetailsType.USER))
     }
 
-    @Test
+    @Test (groups = "group2")
     void getAllLinkedObjectDefinitionsTest() {
         // create first linked object definition
 
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/NetworkZoneIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/NetworkZoneIT.groovy
index afcfeec6ce3..ded3b65817a 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/NetworkZoneIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/NetworkZoneIT.groovy
@@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.*
  */
 class NetworkZoneIT extends ITSupport {
 
-    @Test
+    @Test (groups = "group2")
     void listNetworkZonesTest() {
 
         getClient().listNetworkZones()
@@ -47,7 +47,7 @@ class NetworkZoneIT extends ITSupport {
             })
     }
 
-    @Test
+    @Test (groups = "group2")
     void createAndDeleteNetworkZoneTest() {
 
         String networkZoneName = "network-zone-it-${uniqueTestName}"
@@ -88,7 +88,7 @@ class NetworkZoneIT extends ITSupport {
         assertNotPresent(getClient().listNetworkZones(), createdNetworkZone)
     }
 
-    @Test
+    @Test (groups = "group2")
     void updateNetworkZoneTest() {
 
         String networkZoneName = "network-zone-it-${uniqueTestName}"
@@ -145,7 +145,7 @@ class NetworkZoneIT extends ITSupport {
         )
     }
 
-    @Test
+    @Test (groups = "group2")
     void activateDeactivateNetworkZoneTest() {
 
         String networkZoneName = "network-zone-it-${uniqueTestName}"
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/OIDCApplicationIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/OIDCApplicationIT.groovy
index edcd8ff4c49..3fa00f80186 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/OIDCApplicationIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/OIDCApplicationIT.groovy
@@ -54,7 +54,7 @@ class OIDCApplicationIT extends ITSupport implements CrudTestSupport {
         return (OpenIdConnectApplication) app
     }
 
-    @Test
+    @Test (groups = "group2")
     void createOIDCApplicationWithPrivateKeyJwtTest() {
 
         String name = "java-sdk-it-" + UUID.randomUUID().toString()
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/PolicyRulesIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/PolicyRulesIT.groovy
index 341014c69d8..2839f87d1e4 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/PolicyRulesIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/PolicyRulesIT.groovy
@@ -68,7 +68,7 @@ class PolicyRulesIT extends ITSupport implements CrudTestSupport {
         return crudTestPolicy.listPolicyRules().iterator()
     }
 
-    @Test
+    @Test (groups = "group2")
     void deactivateTest() {
 
         def group = randomGroup()
@@ -92,7 +92,7 @@ class PolicyRulesIT extends ITSupport implements CrudTestSupport {
         assertThat(policyRule.getStatus(), is(PolicyRule.StatusEnum.INACTIVE))
     }
 
-    @Test
+    @Test (groups = "group2")
     void listPolicyRulesTest() {
         def group = randomGroup()
         def policy = randomSignOnPolicy(group.getId())
@@ -104,7 +104,7 @@ class PolicyRulesIT extends ITSupport implements CrudTestSupport {
         })
     }
 
-    @Test
+    @Test (groups = "group2")
     void createPasswordPolicyRule() {
 
         def group = randomGroup()
@@ -129,7 +129,7 @@ class PolicyRulesIT extends ITSupport implements CrudTestSupport {
         assertThat policyRule.getConditions().getNetwork().getConnection(), is(PolicyNetworkCondition.ConnectionEnum.ANYWHERE)
     }
 
-    @Test
+    @Test (groups = "group2")
     void createOktaSignOnOnPremPolicyRule() {
 
         def group = randomGroup()
@@ -157,7 +157,7 @@ class PolicyRulesIT extends ITSupport implements CrudTestSupport {
         assertThat policyRule.getConditions().getAuthContext().getAuthType(), is(PolicyRuleAuthContextCondition.AuthTypeEnum.ANY)
     }
 
-    @Test
+    @Test (groups = "group2")
     void createOktaSignOnRadiusPolicyRule() {
 
         def group = randomGroup()
@@ -182,7 +182,7 @@ class PolicyRulesIT extends ITSupport implements CrudTestSupport {
         assertThat policyRule.getConditions().getNetwork().getConnection(), is(PolicyNetworkCondition.ConnectionEnum.ANYWHERE)
     }
 
-    @Test
+    @Test (groups = "group2")
     void createOktaSignOnCloudPolicyRule() {
 
         def group = randomGroup()
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/SignOnPoliciesIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/SignOnPoliciesIT.groovy
index bd38068e146..4235fb2058b 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/SignOnPoliciesIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/SignOnPoliciesIT.groovy
@@ -57,7 +57,7 @@ class SignOnPoliciesIT implements CrudTestSupport {
         return client.listPolicies(PolicyType.OKTA_SIGN_ON.toString()).iterator()
     }
 
-    @Test
+    @Test (groups = "group2")
     void signOnPolicyWithGroupConditions() {
 
         def group = GroupBuilder.instance()
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/SmsTemplateIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/SmsTemplateIT.groovy
index 966d7e5f486..09e03e4af32 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/SmsTemplateIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/SmsTemplateIT.groovy
@@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.*
  */
 class SmsTemplateIT extends ITSupport {
 
-    @Test
+    @Test (groups = "group2")
     void customTemplatesCrudTest() {
         def templateName = "sdk-it-" + UUID.randomUUID().toString()
         def retryCount = 5
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ThreatInsightConfigurationIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ThreatInsightConfigurationIT.groovy
index 5d73cce88a8..d75ed8bb0b0 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ThreatInsightConfigurationIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/ThreatInsightConfigurationIT.groovy
@@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.notNullValue
  */
 class ThreatInsightConfigurationIT extends ITSupport {
 
-    @Test
+    @Test (groups = "group3")
     void getThreatInsightConfigurationTest() {
 
         ThreatInsightConfiguration currentConfiguration = getClient().getCurrentConfiguration()
@@ -50,7 +50,7 @@ class ThreatInsightConfigurationIT extends ITSupport {
         assertThat(currentConfiguration.getExcludeZones(), notNullValue())
     }
 
-    @Test
+    @Test (groups = "group3")
     void updateThreatInsightConfigurationWithNetworkZoneTest() {
 
         def networkZoneName = "network-zone-it-${uniqueTestName}"
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UserRolesIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UserRolesIT.groovy
index 3d2c9a2c185..503c5093c2c 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UserRolesIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UserRolesIT.groovy
@@ -70,7 +70,7 @@ class UserRolesIT extends ITSupport {
         assertThat("Incorrect RoleType", assignedRole.getType() == RoleType.SUPER_ADMIN)
     }
 
-    @Test
+    @Test (groups = "group3")
     @Scenario("group-targets-for-role")
     void groupTargetsForRoleTest() {
 
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UserTypesIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UserTypesIT.groovy
index abd318921cf..5f3f11da21f 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UserTypesIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UserTypesIT.groovy
@@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.notNullValue
  */
 class UserTypesIT extends ITSupport {
 
-    @Test
+    @Test (groups = "group2")
     void createUserTypeTest() {
         String name = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(15)
 
@@ -64,7 +64,7 @@ class UserTypesIT extends ITSupport {
         })
     }
 
-    @Test
+    @Test (groups = "group2")
     void getUserTypeTest() {
         String name = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(15)
 
@@ -81,7 +81,7 @@ class UserTypesIT extends ITSupport {
         assertThat(retrievedUserType.getName(), equalTo(createdUserType.getName()))
     }
 
-    @Test
+    @Test (groups = "group2")
     void updateUserTypeTest() {
         String name = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(15)
 
@@ -142,7 +142,7 @@ class UserTypesIT extends ITSupport {
         assertThat(customPropertyMap["permissions"][0]["action"], equalTo("READ_ONLY"))
     }
 
-    @Test
+    @Test (groups = "group2")
     void deleteUserTypeTest() {
         String name = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(15)
 
@@ -159,7 +159,7 @@ class UserTypesIT extends ITSupport {
         assertNotPresent(client.listUserTypes(), createdUserType)
     }
 
-    @Test
+    @Test (groups = "group2")
     void listAllUserTypesTest() {
         String name1 = "java_sdk_it_" + RandomStringUtils.randomAlphanumeric(15)
 
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UsersIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UsersIT.groovy
index 0655a639c15..ebc08a2cf44 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UsersIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UsersIT.groovy
@@ -79,7 +79,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         ensureCustomProperties()
     }
 
-    @Test
+    @Test (groups = "group2")
     void userProfileNumberValues() {
 
         def email = "joe.coder+${uniqueTestName}@example.com"
@@ -182,7 +182,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         return client.listUsers().iterator()
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("create-user-with-user-type")
     void createUserWithUserTypeTest() {
 
@@ -226,7 +226,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertPresent(users, user)
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("user-activate")
     void userActivateTest() {
 
@@ -256,7 +256,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertPresent(users, user)
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("user-with-special-character")
     void userWithSpecialCharacterTest() {
         def password = 'Passw0rd!2@3#'
@@ -277,7 +277,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat(client.getUser(email), equalTo(user))
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("user-role-assign")
     void roleAssignTest() {
 
@@ -313,7 +313,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertNotPresent(user.listAssignedRoles(), role)
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("user-change-password")
     void changePasswordTest() {
 
@@ -344,7 +344,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         client.getUser(user.getId())
     }
 
-    @Test
+    @Test (groups = "group2")
     void changeStrictPasswordTest() {
 
         def password = 'Passw0rd!2@3#'
@@ -403,7 +403,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         client.getUser(user.getId())
     }
 
-    @Test(expectedExceptions = ResourceException)
+    @Test(expectedExceptions = ResourceException, groups = "group2")
     @Scenario("user-change-recovery-question")
     void changeRecoveryQuestionTest() {
 
@@ -469,7 +469,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat response.getResetPasswordUrl(), containsString("/reset_password/")
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("user-expire-password")
     void expirePasswordTest() {
 
@@ -496,7 +496,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
     }
 
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("user-get-reset-password-url")
     void resetPasswordUrlTest() {
 
@@ -521,7 +521,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat token.getResetPasswordUrl(), notNullValue()
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("user-get")
     void getUserTest() {
 
@@ -559,7 +559,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         }
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("user-group-target-role")
     void groupTargetRoleTest() {
 
@@ -617,7 +617,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertGroupTargetPresent(user, group, role)
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("user-profile-update")
     void userProfileUpdate() {
 
@@ -649,7 +649,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat(updatedUser.getProfile().get("nickName"), equalTo("Batman"))
     }
 
-    @Test
+    @Test (groups = "group2")
     @Scenario("user-suspend")
     void userSuspendTest() {
 
@@ -682,7 +682,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertPresent(client.listUsers(null, 'status eq \"ACTIVE\"', null, null, null), user)
     }
 
-    @Test
+    @Test (groups = "group2")
     void getUserInvalidUserId() {
         try {
             def userId = "invalid-user-id-${uniqueTestName}@example.com"
@@ -693,7 +693,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         }
     }
 
-    @Test
+    @Test (groups = "group2")
     void getUserNullUserId() {
         try {
             getClient().getUser(null)
@@ -703,7 +703,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         }
     }
 
-    @Test
+    @Test (groups = "group2")
     void getUserEmptyUserId() {
         try {
             getClient().getUser("")
@@ -713,7 +713,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         }
     }
 
-    @Test
+    @Test (groups = "group2")
     void createUserWithGroups() {
 
         def groupName = "Group-to-Assign-${uniqueTestName}"
@@ -747,7 +747,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat groups.get(1).getId(), equalTo(group.id)
     }
 
-    @Test
+    @Test (groups = "group3")
     void setUserPasswordWithoutReset() {
 
         def user = randomUser()
@@ -767,7 +767,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat(result, instanceOf(User))
     }
 
-    @Test
+    @Test (groups = "group3")
     void importUserWithSha512Password() {
 
         def salt = "aSalt"
@@ -786,7 +786,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat user.getCredentials().getProvider().getType(), is(AuthenticationProviderType.IMPORT)
     }
 
-    @Test
+    @Test (groups = "group3")
     @Scenario("user-forgot-password-generate-one-time-token")
     void forgotPasswordGenerateOttTest() {
 
@@ -812,7 +812,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat response.getResetPasswordUrl(), containsString("/signin/reset-password/")
     }
 
-    @Test
+    @Test (groups = "group3")
     @Scenario("user-forgot-password-set-new-password")
     void forgotPasswordSetNewPasswordTest() {
 
@@ -847,7 +847,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat response.get("provider")["name"], equalTo("OKTA")
     }
 
-    @Test
+    @Test (groups = "group3")
     void userWithAuthenticationProviderTest() {
 
         def firstName = 'John'
@@ -874,7 +874,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat user.getCredentials().getProvider().getName(), equalTo(AuthenticationProviderType.FEDERATION.name())
     }
 
-    @Test
+    @Test (groups = "group3")
     void testGetNextPageUrl() {
         def user1 = create(client)
         def user2 = create(client)
@@ -899,7 +899,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         assertThat userListSecondPage.getProperties().get("currentPage").getProperties().get("items").collect().size(), is(greaterThanOrEqualTo(1))
     }
 
-    @Test
+    @Test (groups = "group3")
     void testListGroupAssignmentsWithExpand() {
         //  Create more than 20 groups
         for (int i = 1; i < 30; i++) {
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/util/ClientProvider.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/util/ClientProvider.groovy
index 79272b6138a..48b928b5cd2 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/util/ClientProvider.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/util/ClientProvider.groovy
@@ -179,7 +179,7 @@ trait ClientProvider implements IHookable {
         }
     }
 
-    @AfterMethod
+    @AfterMethod (groups = ["group1", "group2", "group3"])
     void clean() {
         if (!isRunningWithTestServer()) {
             // delete them in reverse order so dependencies are resolved