diff --git a/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
index bb04f7c7425..81975a928cc 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
@@ -13,41 +13,35 @@ acceptance("Poll Builder - polls are disabled", {
   }
 });
 
-test("regular user - sufficient trust level", assert => {
+test("regular user - sufficient trust level", async assert => {
   updateCurrentUser({ moderator: false, admin: false, trust_level: 3 });
 
-  displayPollBuilderButton();
+  await displayPollBuilderButton();
 
-  andThen(() => {
-    assert.ok(
-      !exists(".select-kit-row[title='Build Poll']"),
-      "it hides the builder button"
-    );
-  });
+  assert.ok(
+    !exists(".select-kit-row[title='Build Poll']"),
+    "it hides the builder button"
+  );
 });
 
-test("regular user - insufficient trust level", assert => {
+test("regular user - insufficient trust level", async assert => {
   updateCurrentUser({ moderator: false, admin: false, trust_level: 1 });
 
-  displayPollBuilderButton();
+  await displayPollBuilderButton();
 
-  andThen(() => {
-    assert.ok(
-      !exists(".select-kit-row[title='Build Poll']"),
-      "it hides the builder button"
-    );
-  });
+  assert.ok(
+    !exists(".select-kit-row[title='Build Poll']"),
+    "it hides the builder button"
+  );
 });
 
-test("staff", assert => {
+test("staff", async assert => {
   updateCurrentUser({ moderator: true });
 
-  displayPollBuilderButton();
+  await displayPollBuilderButton();
 
-  andThen(() => {
-    assert.ok(
-      !exists(".select-kit-row[title='Build Poll']"),
-      "it hides the builder button"
-    );
-  });
+  assert.ok(
+    !exists(".select-kit-row[title='Build Poll']"),
+    "it hides the builder button"
+  );
 });