diff --git a/README.md b/README.md
index 29e984f..0406a63 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,4 @@ A theme component that adds a button to the composer tools to easily build table
 
 - [X] Add table builder functionality
 - [ ] Possibly add the ability to edit tables
-- [ ] Add front-end tests 
\ No newline at end of file
+- [X] Add front-end tests
\ No newline at end of file
diff --git a/javascripts/discourse/templates/modal/table-builder-modal.hbs b/javascripts/discourse/templates/modal/table-builder-modal.hbs
index 9130ec1..a01024e 100644
--- a/javascripts/discourse/templates/modal/table-builder-modal.hbs
+++ b/javascripts/discourse/templates/modal/table-builder-modal.hbs
@@ -26,7 +26,7 @@
 
 <div class="modal-footer">
   <DButton
-    @class="btn-primary"
+    @class="btn-primary btn-build-table"
     @label={{theme-prefix "discourse_table_builder.modal.create"}}
     @icon="plus"
     @action={{action "createTable"}}
diff --git a/test/acceptance/table-builder.js b/test/acceptance/table-builder.js
new file mode 100644
index 0000000..73c0e7b
--- /dev/null
+++ b/test/acceptance/table-builder.js
@@ -0,0 +1,32 @@
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+
+acceptance("Table Builder", function (needs) {
+  needs.user();
+
+  test("Can open table builder when creating a topic", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+    click(".table-builder");
+    assert.ok(exists(".table-builder-modal"));
+  });
+
+  test("Can build table", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+    click(".btn-build-table");
+    assert.ok(exists(".d-editor-preview .md-table"));
+  });
+
+  test("Can build table when editing post", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click("#post_1 .show-more-actions");
+    await click("#post_1 .edit");
+    assert.ok(exists("#reply-control"));
+    click(".table-builder");
+    assert.ok(exists(".table-builder-modal"));
+    click(".btn-build-table");
+    assert.ok(exists(".d-editor-preview .md-table"));
+  });
+});