diff --git a/x-pack/test/spaces_api_integration/common/suites/spaces/create.ts b/x-pack/test/spaces_api_integration/common/suites/create.ts
similarity index 96%
rename from x-pack/test/spaces_api_integration/common/suites/spaces/create.ts
rename to x-pack/test/spaces_api_integration/common/suites/create.ts
index 38e27e6077cbf..aa606ffc17100 100644
--- a/x-pack/test/spaces_api_integration/common/suites/spaces/create.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/create.ts
@@ -6,8 +6,8 @@
 
 import expect from 'expect.js';
 import { SuperTest } from 'supertest';
-import { getUrlPrefix } from '../../lib/space_test_utils';
-import { DescribeFn, TestOptions } from '../../lib/types';
+import { getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestOptions } from '../lib/types';
 
 export function createTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
   const makeCreateTest = (describeFn: DescribeFn) => (
diff --git a/x-pack/test/spaces_api_integration/common/suites/spaces/delete.ts b/x-pack/test/spaces_api_integration/common/suites/delete.ts
similarity index 96%
rename from x-pack/test/spaces_api_integration/common/suites/spaces/delete.ts
rename to x-pack/test/spaces_api_integration/common/suites/delete.ts
index de20f6cc27920..78facf746eef9 100644
--- a/x-pack/test/spaces_api_integration/common/suites/spaces/delete.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/delete.ts
@@ -5,8 +5,8 @@
  */
 import expect from 'expect.js';
 import { SuperTest } from 'supertest';
-import { getUrlPrefix } from '../../lib/space_test_utils';
-import { DescribeFn, TestOptions } from '../../lib/types';
+import { getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestOptions } from '../lib/types';
 
 export function deleteTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
   const makeDeleteTest = (describeFn: DescribeFn) => (
diff --git a/x-pack/test/spaces_api_integration/common/suites/spaces/get.ts b/x-pack/test/spaces_api_integration/common/suites/get.ts
similarity index 95%
rename from x-pack/test/spaces_api_integration/common/suites/spaces/get.ts
rename to x-pack/test/spaces_api_integration/common/suites/get.ts
index a8f9ab8c97cfe..84f33e9288536 100644
--- a/x-pack/test/spaces_api_integration/common/suites/spaces/get.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/get.ts
@@ -5,8 +5,8 @@
  */
 import expect from 'expect.js';
 import { SuperAgent } from 'superagent';
-import { getUrlPrefix } from '../../lib/space_test_utils';
-import { DescribeFn, TestOptions } from '../../lib/types';
+import { getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestOptions } from '../lib/types';
 
 export function getTestSuiteFactory(esArchiver: any, supertest: SuperAgent<any>) {
   const nonExistantSpaceId = 'not-a-space';
diff --git a/x-pack/test/spaces_api_integration/common/suites/spaces/get_all.ts b/x-pack/test/spaces_api_integration/common/suites/get_all.ts
similarity index 95%
rename from x-pack/test/spaces_api_integration/common/suites/spaces/get_all.ts
rename to x-pack/test/spaces_api_integration/common/suites/get_all.ts
index d4ba6e875e1b1..b56532b8f0a5b 100644
--- a/x-pack/test/spaces_api_integration/common/suites/spaces/get_all.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/get_all.ts
@@ -5,8 +5,8 @@
  */
 import expect from 'expect.js';
 import { SuperTest } from 'supertest';
-import { getUrlPrefix } from '../../lib/space_test_utils';
-import { DescribeFn, TestOptions } from '../../lib/types';
+import { getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestOptions } from '../lib/types';
 
 export function getAllTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
   const makeGetAllTest = (describeFn: DescribeFn) => (
diff --git a/x-pack/test/spaces_api_integration/common/suites/spaces/select.ts b/x-pack/test/spaces_api_integration/common/suites/select.ts
similarity index 93%
rename from x-pack/test/spaces_api_integration/common/suites/spaces/select.ts
rename to x-pack/test/spaces_api_integration/common/suites/select.ts
index f52d060fea092..64e2af3cdae05 100644
--- a/x-pack/test/spaces_api_integration/common/suites/spaces/select.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/select.ts
@@ -6,9 +6,9 @@
 
 import expect from 'expect.js';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../../plugins/spaces/common/constants';
-import { getUrlPrefix } from '../../lib/space_test_utils';
-import { DescribeFn, TestOptions } from '../../lib/types';
+import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
+import { getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestOptions } from '../lib/types';
 
 export function selectTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
   const nonExistantSpaceId = 'not-a-space';
diff --git a/x-pack/test/spaces_api_integration/common/suites/spaces/update.ts b/x-pack/test/spaces_api_integration/common/suites/update.ts
similarity index 95%
rename from x-pack/test/spaces_api_integration/common/suites/spaces/update.ts
rename to x-pack/test/spaces_api_integration/common/suites/update.ts
index f8c37bed922e3..d0028f7f27284 100644
--- a/x-pack/test/spaces_api_integration/common/suites/spaces/update.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/update.ts
@@ -5,8 +5,8 @@
  */
 import expect from 'expect.js';
 import { SuperTest } from 'supertest';
-import { getUrlPrefix } from '../../lib/space_test_utils';
-import { DescribeFn, TestOptions } from '../../lib/types';
+import { getUrlPrefix } from '../lib/space_test_utils';
+import { DescribeFn, TestOptions } from '../lib/types';
 
 export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
   const makeUpdateTest = (describeFn: DescribeFn) => (
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/create.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/create.ts
index 21f545256fd3d..b50a755dda068 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/create.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/create.ts
@@ -7,7 +7,7 @@
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { createTestSuiteFactory } from '../../common/suites/spaces/create';
+import { createTestSuiteFactory } from '../../common/suites/create';
 
 // tslint:disable:no-default-export
 export default function createSpacesOnlySuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/delete.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/delete.ts
index f70400a7d248a..220d7c3b0087f 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/delete.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/delete.ts
@@ -7,7 +7,7 @@
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { deleteTestSuiteFactory } from '../../common/suites/spaces/delete';
+import { deleteTestSuiteFactory } from '../../common/suites/delete';
 
 // tslint:disable:no-default-export
 export default function deleteSpaceTestSuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/get.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/get.ts
index ae09edbbf8db3..7aec52d7ce2f5 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/get.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/get.ts
@@ -7,7 +7,7 @@
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { getTestSuiteFactory } from '../../common/suites/spaces/get';
+import { getTestSuiteFactory } from '../../common/suites/get';
 
 // tslint:disable:no-default-export
 export default function getSpaceTestSuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/get_all.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/get_all.ts
index 86325084591d9..56d98fca7c0a8 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/get_all.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/get_all.ts
@@ -7,7 +7,7 @@
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { getAllTestSuiteFactory } from '../../common/suites/spaces/get_all';
+import { getAllTestSuiteFactory } from '../../common/suites/get_all';
 
 // tslint:disable:no-default-export
 export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/select.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/select.ts
index 0e40ca405b640..ab6f086544dce 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/select.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/select.ts
@@ -7,7 +7,7 @@
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { selectTestSuiteFactory } from '../../common/suites/spaces/select';
+import { selectTestSuiteFactory } from '../../common/suites/select';
 
 // tslint:disable:no-default-export
 export default function selectSpaceTestSuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/update.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/update.ts
index 124063b0e6c02..125514c08ba3c 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/update.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/update.ts
@@ -7,7 +7,7 @@
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { updateTestSuiteFactory } from '../../common/suites/spaces/update';
+import { updateTestSuiteFactory } from '../../common/suites/update';
 
 // tslint:disable:no-default-export
 export default function updateSpaceTestSuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/create.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/create.ts
index 236225699ecf4..7b0f4f7038113 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/create.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/create.ts
@@ -6,7 +6,7 @@
 
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { createTestSuiteFactory } from '../../common/suites/spaces/create';
+import { createTestSuiteFactory } from '../../common/suites/create';
 
 // tslint:disable:no-default-export
 export default function createSpacesOnlySuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/delete.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/delete.ts
index 22a4699337ca8..15c4bb8ab621d 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/delete.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/delete.ts
@@ -6,7 +6,7 @@
 
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { deleteTestSuiteFactory } from '../../common/suites/spaces/delete';
+import { deleteTestSuiteFactory } from '../../common/suites/delete';
 
 // tslint:disable:no-default-export
 export default function deleteSpaceTestSuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/get.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/get.ts
index c3dbbf5cf30e3..876f969161fea 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/get.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/get.ts
@@ -6,7 +6,7 @@
 
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { getTestSuiteFactory } from '../../common/suites/spaces/get';
+import { getTestSuiteFactory } from '../../common/suites/get';
 
 // tslint:disable:no-default-export
 export default function getSpaceTestSuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/get_all.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/get_all.ts
index 48866fb6f181c..4380df0d196f9 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/get_all.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/get_all.ts
@@ -6,7 +6,7 @@
 
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { getAllTestSuiteFactory } from '../../common/suites/spaces/get_all';
+import { getAllTestSuiteFactory } from '../../common/suites/get_all';
 
 // tslint:disable:no-default-export
 export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/select.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/select.ts
index 47a8226775241..ba78d722eca70 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/select.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/select.ts
@@ -6,7 +6,7 @@
 
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { selectTestSuiteFactory } from '../../common/suites/spaces/select';
+import { selectTestSuiteFactory } from '../../common/suites/select';
 
 // tslint:disable:no-default-export
 export default function selectSpaceTestSuite({ getService }: TestInvoker) {
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/update.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/update.ts
index 48f7ea3533b6e..e3d2368ce8d3c 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/update.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/update.ts
@@ -6,7 +6,7 @@
 
 import { SPACES } from '../../common/lib/spaces';
 import { TestInvoker } from '../../common/lib/types';
-import { updateTestSuiteFactory } from '../../common/suites/spaces/update';
+import { updateTestSuiteFactory } from '../../common/suites/update';
 
 // tslint:disable:no-default-export
 export default function updateSpaceTestSuite({ getService }: TestInvoker) {