diff --git a/ui-v2/app/adapters/intention.js b/ui-v2/app/adapters/intention.js
index cd0299d96..d749efeb8 100644
--- a/ui-v2/app/adapters/intention.js
+++ b/ui-v2/app/adapters/intention.js
@@ -53,9 +53,9 @@ export default Adapter.extend({
       switch (true) {
         case this.isQueryRecord(url):
         case this.isUpdateRecord(url):
-        // TODO: We just need to upgrade this entire API to
-        // use a full request-like object
         case this.isCreateRecord(url, requestData.method):
+          // TODO: We just need to upgrade this (^^ sorry linter) entire API to
+          // use a full request-like object
           response = {
             ...response,
             ...{
diff --git a/ui-v2/app/controllers/dc/intentions/edit.js b/ui-v2/app/controllers/dc/intentions/edit.js
index c9151e25a..a9f8307b2 100644
--- a/ui-v2/app/controllers/dc/intentions/edit.js
+++ b/ui-v2/app/controllers/dc/intentions/edit.js
@@ -39,6 +39,11 @@ export default Controller.extend({
     change: function(e, value, _target) {
       // normalize back to standard event
       const target = e.target || { ..._target, ...{ name: e, value: value } };
+      let name,
+        selected = target.value;
+      // TODO:
+      // linter needs this here?
+      let match;
       switch (target.name) {
         case 'Description':
         case 'Action':
@@ -46,14 +51,14 @@ export default Controller.extend({
           break;
         case 'SourceName':
         case 'DestinationName':
-          let name = target.value;
-          let selected = target.value;
           if (typeof name !== 'string') {
             name = get(target.value, 'Name');
           }
-          const match = get(this, 'items').filterBy('Name', name);
+          // linter doesn't like const here
+          match = get(this, 'items').filterBy('Name', name);
           if (match.length === 0) {
             selected = { Name: name };
+            // linter doesn't mind const here?
             const items = [selected].concat(this.items.toArray());
             set(this, 'items', items);
           }
diff --git a/ui-v2/tests/unit/routes/dc/intentions/create-test.js b/ui-v2/tests/unit/routes/dc/intentions/create-test.js
index 45f688c8e..97b24ee22 100644
--- a/ui-v2/tests/unit/routes/dc/intentions/create-test.js
+++ b/ui-v2/tests/unit/routes/dc/intentions/create-test.js
@@ -2,7 +2,13 @@ import { moduleFor, test } from 'ember-qunit';
 
 moduleFor('route:dc/intentions/create', 'Unit | Route | dc/intentions/create', {
   // Specify the other units that are required for this test.
-  needs: ['service:intentions', 'service:feedback', 'service:logger', 'service:flashMessages'],
+  needs: [
+    'service:services',
+    'service:intentions',
+    'service:feedback',
+    'service:logger',
+    'service:flashMessages',
+  ],
 });
 
 test('it exists', function(assert) {
diff --git a/ui-v2/tests/unit/routes/dc/intentions/edit-test.js b/ui-v2/tests/unit/routes/dc/intentions/edit-test.js
index 9bb112394..50ce0ca78 100644
--- a/ui-v2/tests/unit/routes/dc/intentions/edit-test.js
+++ b/ui-v2/tests/unit/routes/dc/intentions/edit-test.js
@@ -2,7 +2,13 @@ import { moduleFor, test } from 'ember-qunit';
 
 moduleFor('route:dc/intentions/edit', 'Unit | Route | dc/intentions/edit', {
   // Specify the other units that are required for this test.
-  needs: ['service:intentions', 'service:feedback', 'service:logger', 'service:flashMessages'],
+  needs: [
+    'service:services',
+    'service:intentions',
+    'service:feedback',
+    'service:logger',
+    'service:flashMessages',
+  ],
 });
 
 test('it exists', function(assert) {