diff --git a/test/javascripts/acceptance/payments-test.js b/test/javascripts/acceptance/payments-test.js
index b81e79c..8b6fbb6 100644
--- a/test/javascripts/acceptance/payments-test.js
+++ b/test/javascripts/acceptance/payments-test.js
@@ -3,7 +3,7 @@ import { test } from "qunit";
 import { acceptance, count } from "discourse/tests/helpers/qunit-helpers";
 import { stubStripe } from "discourse/plugins/discourse-subscriptions/helpers/stripe";
 
-acceptance("Discourse Subscriptions", function (needs) {
+acceptance("Subscriptions", function (needs) {
   needs.user();
   needs.hooks.beforeEach(function () {
     stubStripe();
diff --git a/test/javascripts/acceptance/subscribe-test.js b/test/javascripts/acceptance/subscribe-test.js
index a684e42..58a75df 100644
--- a/test/javascripts/acceptance/subscribe-test.js
+++ b/test/javascripts/acceptance/subscribe-test.js
@@ -20,7 +20,7 @@ function singleProductPretender() {
   });
 }
 
-acceptance("Discourse Subscriptions", function (needs) {
+acceptance("Subscriptions", function (needs) {
   needs.user();
   needs.hooks.beforeEach(function () {
     stubStripe();
diff --git a/test/javascripts/integration/components/payment-options-test.js b/test/javascripts/integration/components/payment-options-test.js
index 662108f..37b583b 100644
--- a/test/javascripts/integration/components/payment-options-test.js
+++ b/test/javascripts/integration/components/payment-options-test.js
@@ -4,10 +4,10 @@ import componentTest, {
 } from "discourse/tests/helpers/component-test";
 import { count, discourseModule } from "discourse/tests/helpers/qunit-helpers";
 
-discourseModule("payment-options", function (hooks) {
+discourseModule("Subscriptions | payment-options", function (hooks) {
   setupRenderingTest(hooks);
 
-  componentTest("Discourse Subscriptions payment options have no plans", {
+  componentTest("payment options have no plans", {
     template: hbs`{{payment-options plans=plans}}`,
 
     async test(assert) {
@@ -21,7 +21,7 @@ discourseModule("payment-options", function (hooks) {
     },
   });
 
-  componentTest("Discourse Subscriptions payment options has content", {
+  componentTest("payment options has content", {
     template: hbs`{{payment-options
       plans=plans
       selectedPlan=selectedPlan
diff --git a/test/javascripts/integration/components/payment-plan-test.js b/test/javascripts/integration/components/payment-plan-test.js
index 8b65d1d..dcc3f6e 100644
--- a/test/javascripts/integration/components/payment-plan-test.js
+++ b/test/javascripts/integration/components/payment-plan-test.js
@@ -8,7 +8,7 @@ import {
   query,
 } from "discourse/tests/helpers/qunit-helpers";
 
-discourseModule("payment-plan", function (hooks) {
+discourseModule("Subscriptions | payment-plan", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("Payment plan subscription button rendered", {
diff --git a/test/javascripts/helpers/format-currency-test.js b/test/javascripts/unit/helpers/format-currency-test.js
similarity index 87%
rename from test/javascripts/helpers/format-currency-test.js
rename to test/javascripts/unit/helpers/format-currency-test.js
index c31609c..5e5fec0 100644
--- a/test/javascripts/helpers/format-currency-test.js
+++ b/test/javascripts/unit/helpers/format-currency-test.js
@@ -2,7 +2,7 @@ import { setupTest } from "ember-qunit";
 import { module, test } from "qunit";
 import { formatCurrency } from "discourse/plugins/discourse-subscriptions/discourse/helpers/format-currency";
 
-module("Unit | Helper | format-currency", function (hooks) {
+module("Subscriptions | Unit | Helper | format-currency", function (hooks) {
   setupTest(hooks);
 
   test("it formats USD correctly", function (assert) {
diff --git a/test/javascripts/models/plan-test.js b/test/javascripts/unit/models/plan-test.js
similarity index 93%
rename from test/javascripts/models/plan-test.js
rename to test/javascripts/unit/models/plan-test.js
index fdf82bc..3093de6 100644
--- a/test/javascripts/models/plan-test.js
+++ b/test/javascripts/unit/models/plan-test.js
@@ -1,7 +1,7 @@
 import { module, test } from "qunit";
 import Plan from "discourse/plugins/discourse-subscriptions/discourse/models/plan";
 
-module("discourse-patrons:model:plan", function () {
+module("Subscriptions | Unit | Model | plan", function () {
   test("subscriptionRate", function (assert) {
     const plan = Plan.create({
       unit_amount: "2399",