diff --git a/qa-core/package.json b/qa-core/package.json
index 1fbd0c0254..710e0b6a3b 100644
--- a/qa-core/package.json
+++ b/qa-core/package.json
@@ -15,10 +15,10 @@
     "test:watch": "yarn run test --watch",
     "test:debug": "DEBUG=1 yarn run test",
     "test:notify": "node scripts/testResultsWebhook",
-    "test:cloud:prod": "yarn run test --testPathIgnorePatterns=/.+\\.integration\\.spec\\.ts",
+    "test:cloud:prod": "yarn run test --testPathIgnorePatterns=\\.integration\\.",
     "test:cloud:qa": "yarn run test",
-    "test:ci": "yarn run test --testPathIgnorePatterns=/.+\\.integration\\.spec\\.ts /account-api/",
-    "serve:test:ci": "start-server-and-test dev:built http://localhost:4001/health test:smoke",
+    "test:self:ci": "yarn run test --testPathIgnorePatterns=\\.integration\\. \\.cloud\\.",
+    "serve:test:self:ci": "start-server-and-test dev:built http://localhost:4001/health test:self:ci",
     "serve": "start-server-and-test dev:built http://localhost:4001/health",
     "dev:built": "cd ../ && yarn dev:built"
   },
diff --git a/qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts b/qa-core/src/account-api/tests/accounts/accounts.cloud.internal.spec.ts
similarity index 100%
rename from qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts
rename to qa-core/src/account-api/tests/accounts/accounts.cloud.internal.spec.ts
diff --git a/qa-core/src/account-api/tests/accounts/accounts.spec.ts b/qa-core/src/account-api/tests/accounts/accounts.cloud.spec.ts
similarity index 100%
rename from qa-core/src/account-api/tests/accounts/accounts.spec.ts
rename to qa-core/src/account-api/tests/accounts/accounts.cloud.spec.ts