diff --git a/ui-v2/app/templates/components/action-group.hbs b/ui-v2/app/templates/components/action-group.hbs
index 5c44421b4..eae6e4421 100644
--- a/ui-v2/app/templates/components/action-group.hbs
+++ b/ui-v2/app/templates/components/action-group.hbs
@@ -1,8 +1,12 @@
-<input type="radio" name="actions" id="actions_{{index}}" checked={{if (eq checked 'checked') 'checked' }} onchange={{action onchange}} value={{index}} />
-<label for="actions_{{index}}">
-    <span>Open</span>
-</label>
-<label for="actions_close">
-    <span>Close</span>
-</label>
-{{yield}}
+{{! action groups are block only components, you MUST specify a list of actions in the component body }}
+{{! therefore if you call this component as an inline component, nothing is produced }}
+{{#if hasBlock }}
+  <input type="radio" name="actions" id="actions_{{index}}" checked={{if (eq checked 'checked') 'checked' }} onchange={{action onchange}} value={{index}} />
+  <label for="actions_{{index}}">
+      <span>Open</span>
+  </label>
+  <label for="actions_close">
+      <span>Close</span>
+  </label>
+  {{yield}}
+{{/if}}
diff --git a/ui-v2/tests/integration/components/action-group-test.js b/ui-v2/tests/integration/components/action-group-test.js
index dd0ffa5fb..9769fa166 100644
--- a/ui-v2/tests/integration/components/action-group-test.js
+++ b/ui-v2/tests/integration/components/action-group-test.js
@@ -1,11 +1,20 @@
-import { moduleForComponent, test, skip } from 'ember-qunit';
+import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
 moduleForComponent('action-group', 'Integration | Component | action group', {
   integration: true,
 });
 
-skip("it doesn't render anything when used inline");
+test("it doesn't render anything when used inline", function(assert) {
+  this.render(hbs`{{action-group}}`);
+
+  assert.equal(
+    this.$()
+      .text()
+      .trim(),
+    ''
+  );
+});
 test('it renders', function(assert) {
   // Set any properties with this.set('myProperty', 'value');
   // Handle any actions with this.on('myAction', function(val) { ... });
diff --git a/ui-v2/tests/integration/components/code-editor-test.js b/ui-v2/tests/integration/components/code-editor-test.js
index 6e2031331..d73999d6b 100644
--- a/ui-v2/tests/integration/components/code-editor-test.js
+++ b/ui-v2/tests/integration/components/code-editor-test.js
@@ -1,32 +1,24 @@
-import { moduleForComponent, skip } from 'ember-qunit';
+import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
 moduleForComponent('code-editor', 'Integration | Component | code editor', {
   integration: true,
 });
 
-skip('it renders', function(assert) {
+test('it renders', function(assert) {
   // Set any properties with this.set('myProperty', 'value');
   // Handle any actions with this.on('myAction', function(val) { ... });
 
   this.render(hbs`{{code-editor}}`);
 
-  assert.equal(
-    this.$()
-      .text()
-      .trim(),
-    '1' // this comes with some strange whitespace
-  );
+  // this test is just to prove it renders something without producing
+  // an error. It renders the number 1, but seems to also render some sort of trailing space
+  // so just check for presence of CodeMirror
+  assert.equal(this.$().find('.CodeMirror').length, 1);
 
   // Template block usage:
   this.render(hbs`
     {{#code-editor}}{{/code-editor}}
   `);
-
-  assert.equal(
-    this.$()
-      .text()
-      .trim(),
-    '1'
-  );
+  assert.equal(this.$().find('.CodeMirror').length, 1);
 });