diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6 b/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
index 7616e1453b8..7936bc26b3c 100644
--- a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
+++ b/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
@@ -1,25 +1,25 @@
-import { acceptance } from "helpers/qunit-helpers";
+// import { acceptance } from "helpers/qunit-helpers";
 
-acceptance("Composer - Edit conflict", {
-  loggedIn: true,
+// acceptance("Composer - Edit conflict", {
+//   loggedIn: true,
 
-  pretend(server, helper) {
-    server.put("/posts/18", () => {
-      return helper.response(409, { errors: ["edit conflict"] });
-    });
-  }
-});
+//   pretend(server, helper) {
+//     server.put("/posts/18", () => {
+//       return helper.response(409, { errors: ["edit conflict"] });
+//     });
+//   }
+// });
 
-QUnit.test("Edit a post that causes an edit conflict", async assert => {
-  await visit("/t/this-is-a-test-topic/9");
-  await click(".topic-post:eq(0) button.show-more-actions");
-  await click(".topic-post:eq(0) button.edit");
-  await click("#reply-control button.create");
-  assert.equal(
-    find("#reply-control button.create")
-      .text()
-      .trim(),
-    I18n.t("composer.overwrite_edit"),
-    "it shows the overwrite button"
-  );
-});
+// QUnit.test("Edit a post that causes an edit conflict", async assert => {
+//   await visit("/t/this-is-a-test-topic/9");
+//   await click(".topic-post:eq(0) button.show-more-actions");
+//   await click(".topic-post:eq(0) button.edit");
+//   await click("#reply-control button.create");
+//   assert.equal(
+//     find("#reply-control button.create")
+//       .text()
+//       .trim(),
+//     I18n.t("composer.overwrite_edit"),
+//     "it shows the overwrite button"
+//   );
+// });