diff --git a/ui-v2/tests/integration/adapters/acl/url-test.js b/ui-v2/tests/integration/adapters/acl-test.js
similarity index 97%
rename from ui-v2/tests/integration/adapters/acl/url-test.js
rename to ui-v2/tests/integration/adapters/acl-test.js
index 0fdcc0b7901e..5b921124fa02 100644
--- a/ui-v2/tests/integration/adapters/acl/url-test.js
+++ b/ui-v2/tests/integration/adapters/acl-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | acl | url', function(hooks) {
+module('Integration | Adapter | acl', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'token-name';
diff --git a/ui-v2/tests/integration/adapters/coordinate/url-test.js b/ui-v2/tests/integration/adapters/coordinate-test.js
similarity index 87%
rename from ui-v2/tests/integration/adapters/coordinate/url-test.js
rename to ui-v2/tests/integration/adapters/coordinate-test.js
index 7ffffce96152..eb8ef724c20b 100644
--- a/ui-v2/tests/integration/adapters/coordinate/url-test.js
+++ b/ui-v2/tests/integration/adapters/coordinate-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | coordinate | url', function(hooks) {
+module('Integration | Adapter | coordinate', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   test('requestForQuery returns the correct url', function(assert) {
diff --git a/ui-v2/tests/integration/adapters/dc/url-test.js b/ui-v2/tests/integration/adapters/dc-test.js
similarity index 87%
rename from ui-v2/tests/integration/adapters/dc/url-test.js
rename to ui-v2/tests/integration/adapters/dc-test.js
index dd4105610d58..69573378c624 100644
--- a/ui-v2/tests/integration/adapters/dc/url-test.js
+++ b/ui-v2/tests/integration/adapters/dc-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | dc | url', function(hooks) {
+module('Integration | Adapter | dc', function(hooks) {
   setupTest(hooks);
   test('requestForFindAll returns the correct url', function(assert) {
     const adapter = this.owner.lookup('adapter:dc');
diff --git a/ui-v2/tests/integration/adapters/intention/url-test.js b/ui-v2/tests/integration/adapters/intention-test.js
similarity index 97%
rename from ui-v2/tests/integration/adapters/intention/url-test.js
rename to ui-v2/tests/integration/adapters/intention-test.js
index 4215327d40ff..5d6df796216d 100644
--- a/ui-v2/tests/integration/adapters/intention/url-test.js
+++ b/ui-v2/tests/integration/adapters/intention-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | intention | url', function(hooks) {
+module('Integration | Adapter | intention', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'intention-name';
diff --git a/ui-v2/tests/integration/adapters/kv/url-test.js b/ui-v2/tests/integration/adapters/kv-test.js
similarity index 98%
rename from ui-v2/tests/integration/adapters/kv/url-test.js
rename to ui-v2/tests/integration/adapters/kv-test.js
index 933f2ecf09b8..5ccdf402477e 100644
--- a/ui-v2/tests/integration/adapters/kv/url-test.js
+++ b/ui-v2/tests/integration/adapters/kv-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | kv | url', function(hooks) {
+module('Integration | Adapter | kv', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'key-name/here';
diff --git a/ui-v2/tests/integration/adapters/node/url-test.js b/ui-v2/tests/integration/adapters/node-test.js
similarity index 95%
rename from ui-v2/tests/integration/adapters/node/url-test.js
rename to ui-v2/tests/integration/adapters/node-test.js
index 0aeab8e93831..5fdbdee21118 100644
--- a/ui-v2/tests/integration/adapters/node/url-test.js
+++ b/ui-v2/tests/integration/adapters/node-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | node | url', function(hooks) {
+module('Integration | Adapter | node', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'node-name';
diff --git a/ui-v2/tests/integration/adapters/policy/url-test.js b/ui-v2/tests/integration/adapters/policy-test.js
similarity index 97%
rename from ui-v2/tests/integration/adapters/policy/url-test.js
rename to ui-v2/tests/integration/adapters/policy-test.js
index 987a199af47a..8b7e5f30616b 100644
--- a/ui-v2/tests/integration/adapters/policy/url-test.js
+++ b/ui-v2/tests/integration/adapters/policy-test.js
@@ -1,6 +1,6 @@
 import { module, test, skip } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | policy | url', function(hooks) {
+module('Integration | Adapter | policy', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'policy-name';
diff --git a/ui-v2/tests/integration/adapters/role/url-test.js b/ui-v2/tests/integration/adapters/role-test.js
similarity index 97%
rename from ui-v2/tests/integration/adapters/role/url-test.js
rename to ui-v2/tests/integration/adapters/role-test.js
index e7dab419e33e..4de929c577e5 100644
--- a/ui-v2/tests/integration/adapters/role/url-test.js
+++ b/ui-v2/tests/integration/adapters/role-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | role | url', function(hooks) {
+module('Integration | Adapter | role', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'role-name';
diff --git a/ui-v2/tests/integration/adapters/service/url-test.js b/ui-v2/tests/integration/adapters/service-test.js
similarity index 95%
rename from ui-v2/tests/integration/adapters/service/url-test.js
rename to ui-v2/tests/integration/adapters/service-test.js
index 6d0bd74592f3..3235b50f2883 100644
--- a/ui-v2/tests/integration/adapters/service/url-test.js
+++ b/ui-v2/tests/integration/adapters/service-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | service | url', function(hooks) {
+module('Integration | Adapter | service', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'service-name';
diff --git a/ui-v2/tests/integration/adapters/session/url-test.js b/ui-v2/tests/integration/adapters/session-test.js
similarity index 96%
rename from ui-v2/tests/integration/adapters/session/url-test.js
rename to ui-v2/tests/integration/adapters/session-test.js
index f99e554b4fef..10b71694c7d9 100644
--- a/ui-v2/tests/integration/adapters/session/url-test.js
+++ b/ui-v2/tests/integration/adapters/session-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | session | url', function(hooks) {
+module('Integration | Adapter | session', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'session-id';
diff --git a/ui-v2/tests/integration/adapters/token/url-test.js b/ui-v2/tests/integration/adapters/token-test.js
similarity index 97%
rename from ui-v2/tests/integration/adapters/token/url-test.js
rename to ui-v2/tests/integration/adapters/token-test.js
index f350c2c44e2d..2e71583e9a95 100644
--- a/ui-v2/tests/integration/adapters/token/url-test.js
+++ b/ui-v2/tests/integration/adapters/token-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-module('Integration | Adapter | token | url', function(hooks) {
+module('Integration | Adapter | token', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'policy-id';
diff --git a/ui-v2/tests/integration/adapters/acl/response-test.js b/ui-v2/tests/integration/serializers/acl-test.js
similarity index 96%
rename from ui-v2/tests/integration/adapters/acl/response-test.js
rename to ui-v2/tests/integration/serializers/acl-test.js
index 1acf730a6760..75ea55db3b90 100644
--- a/ui-v2/tests/integration/adapters/acl/response-test.js
+++ b/ui-v2/tests/integration/serializers/acl-test.js
@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
 import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
-module('Integration | Adapter | acl | response', function(hooks) {
+module('Integration | Serializer | acl', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'token-name';
diff --git a/ui-v2/tests/integration/adapters/coordinate/response-test.js b/ui-v2/tests/integration/serializers/coordinate-test.js
similarity index 92%
rename from ui-v2/tests/integration/adapters/coordinate/response-test.js
rename to ui-v2/tests/integration/serializers/coordinate-test.js
index 9b3e6d140735..8cfce9c4188f 100644
--- a/ui-v2/tests/integration/adapters/coordinate/response-test.js
+++ b/ui-v2/tests/integration/serializers/coordinate-test.js
@@ -1,7 +1,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-module('Integration | Adapter | coordinate | response', function(hooks) {
+module('Integration | Serializer | coordinate', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   test('respondForQuery returns the correct data for list endpoint', function(assert) {
diff --git a/ui-v2/tests/integration/adapters/dc/response-test.js b/ui-v2/tests/integration/serializers/dc-test.js
similarity index 91%
rename from ui-v2/tests/integration/adapters/dc/response-test.js
rename to ui-v2/tests/integration/serializers/dc-test.js
index f1b3aeddb946..02e84a746e68 100644
--- a/ui-v2/tests/integration/adapters/dc/response-test.js
+++ b/ui-v2/tests/integration/serializers/dc-test.js
@@ -1,7 +1,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-module('Integration | Adapter | dc | response', function(hooks) {
+module('Integration | Serializer | dc', function(hooks) {
   setupTest(hooks);
   test('respondForFindAll returns the correct data for list endpoint', function(assert) {
     const serializer = this.owner.lookup('serializer:dc');
diff --git a/ui-v2/tests/integration/adapters/intention/response-test.js b/ui-v2/tests/integration/serializers/intention-test.js
similarity index 96%
rename from ui-v2/tests/integration/adapters/intention/response-test.js
rename to ui-v2/tests/integration/serializers/intention-test.js
index c6f022d0a16f..5155084733db 100644
--- a/ui-v2/tests/integration/adapters/intention/response-test.js
+++ b/ui-v2/tests/integration/serializers/intention-test.js
@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
 import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
-module('Integration | Adapter | intention | response', function(hooks) {
+module('Integration | Serializer | intention', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'intention-name';
diff --git a/ui-v2/tests/integration/adapters/kv/response-test.js b/ui-v2/tests/integration/serializers/kv-test.js
similarity index 96%
rename from ui-v2/tests/integration/adapters/kv/response-test.js
rename to ui-v2/tests/integration/serializers/kv-test.js
index e61fe610c3e5..031764da1a1f 100644
--- a/ui-v2/tests/integration/adapters/kv/response-test.js
+++ b/ui-v2/tests/integration/serializers/kv-test.js
@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
 import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
-module('Integration | Adapter | kv | response', function(hooks) {
+module('Integration | Serializer | kv', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'key-name/here';
diff --git a/ui-v2/tests/integration/adapters/node/response-test.js b/ui-v2/tests/integration/serializers/node-test.js
similarity index 96%
rename from ui-v2/tests/integration/adapters/node/response-test.js
rename to ui-v2/tests/integration/serializers/node-test.js
index e127b6b32b05..9fe7611c7201 100644
--- a/ui-v2/tests/integration/adapters/node/response-test.js
+++ b/ui-v2/tests/integration/serializers/node-test.js
@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
 import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
-module('Integration | Adapter | node | response', function(hooks) {
+module('Integration | Serializer | node', function(hooks) {
   setupTest(hooks);
   test('respondForQuery returns the correct data for list endpoint', function(assert) {
     const serializer = this.owner.lookup('serializer:node');
diff --git a/ui-v2/tests/integration/adapters/policy/response-test.js b/ui-v2/tests/integration/serializers/policy-test.js
similarity index 96%
rename from ui-v2/tests/integration/adapters/policy/response-test.js
rename to ui-v2/tests/integration/serializers/policy-test.js
index 944ebbf312ec..def19bc6b560 100644
--- a/ui-v2/tests/integration/adapters/policy/response-test.js
+++ b/ui-v2/tests/integration/serializers/policy-test.js
@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
 import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
-module('Integration | Adapter | policy | response', function(hooks) {
+module('Integration | Serializer | policy', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'policy-name';
diff --git a/ui-v2/tests/integration/adapters/role/response-test.js b/ui-v2/tests/integration/serializers/role-test.js
similarity index 96%
rename from ui-v2/tests/integration/adapters/role/response-test.js
rename to ui-v2/tests/integration/serializers/role-test.js
index 7b20b89fc328..f9949a518c66 100644
--- a/ui-v2/tests/integration/adapters/role/response-test.js
+++ b/ui-v2/tests/integration/serializers/role-test.js
@@ -4,7 +4,7 @@ import { get } from 'consul-ui/tests/helpers/api';
 import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
 import { createPolicies } from 'consul-ui/tests/helpers/normalizers';
 
-module('Integration | Adapter | role | response', function(hooks) {
+module('Integration | Serializer | role', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'role-name';
diff --git a/ui-v2/tests/integration/adapters/service/response-test.js b/ui-v2/tests/integration/serializers/service-test.js
similarity index 96%
rename from ui-v2/tests/integration/adapters/service/response-test.js
rename to ui-v2/tests/integration/serializers/service-test.js
index c3ada060a582..4aca6bf29b68 100644
--- a/ui-v2/tests/integration/adapters/service/response-test.js
+++ b/ui-v2/tests/integration/serializers/service-test.js
@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
 import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
-module('Integration | Adapter | service | response', function(hooks) {
+module('Integration | Serializer | service', function(hooks) {
   setupTest(hooks);
   test('respondForQuery returns the correct data for list endpoint', function(assert) {
     const serializer = this.owner.lookup('serializer:service');
diff --git a/ui-v2/tests/integration/adapters/session/response-test.js b/ui-v2/tests/integration/serializers/session-test.js
similarity index 100%
rename from ui-v2/tests/integration/adapters/session/response-test.js
rename to ui-v2/tests/integration/serializers/session-test.js
diff --git a/ui-v2/tests/integration/adapters/token/response-test.js b/ui-v2/tests/integration/serializers/token-test.js
similarity index 96%
rename from ui-v2/tests/integration/adapters/token/response-test.js
rename to ui-v2/tests/integration/serializers/token-test.js
index 230535b622f8..b0d096c64ddb 100644
--- a/ui-v2/tests/integration/adapters/token/response-test.js
+++ b/ui-v2/tests/integration/serializers/token-test.js
@@ -5,7 +5,7 @@ import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
 
 import { createPolicies } from 'consul-ui/tests/helpers/normalizers';
 
-module('Integration | Adapter | token | response', function(hooks) {
+module('Integration | Serializer | token', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
   const id = 'token-name';