diff --git a/ui/desktop/tests/acceptance/origin-test.js b/ui/desktop/tests/acceptance/origin-test.js
index 59c95ab1d..7181d33de 100644
--- a/ui/desktop/tests/acceptance/origin-test.js
+++ b/ui/desktop/tests/acceptance/origin-test.js
@@ -188,16 +188,21 @@ module('Acceptance | origin', function (hooks) {
     assert.ok(find('.rose-notification.is-error'));
   });
 
-  test('origin set automatically in dev mode', async function (assert) {
+  test('origin set automatically when autoOrigin is true', async function (assert) {
     assert.expect(1);
     config.autoOrigin = true;
     await visit(urls.origin);
-    await fillIn('[name="host"]', currentOrigin);
-    await click('[type="submit"]');
-    assert.equal(this.owner.lookup('controller:origin').origin, currentOrigin);
+    assert.equal(find('[name="host"]').value, currentOrigin);
     config.autoOrigin = false;
   });
 
+  test('origin is *not* set automatically when autoOrigin is false', async function (assert) {
+    assert.expect(2);
+    assert.notOk(config.autoOrigin, 'autoOrigin is disabled');
+    await visit(urls.origin);
+    assert.notOk(find('[name="host"]').value, 'Origin field is empty');
+  });
+
   test('can reset origin on error', async function (assert) {
     assert.expect(4);
     this.server.get('/targets', () => new Response(500));