diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6df1de3a5..becaeb570 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,6 +10,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: denolib/setup-deno@v2
       - name: Run test script
-        run: deno test --allow-net --allow-env tests/
+        run: deno test --allow-net --allow-env
     env:
       DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
diff --git a/tests/01_main.test.ts b/tests/01_main.ts
similarity index 87%
rename from tests/01_main.test.ts
rename to tests/01_main.ts
index 3824e3c56..5e279a474 100644
--- a/tests/01_main.test.ts
+++ b/tests/01_main.ts
@@ -6,11 +6,6 @@ if (!token) throw new Error("Token is not provided");
 startBot({
   token,
   intents: [Intents.GUILD_MESSAGES, Intents.GUILDS],
-  eventHandlers: {
-    debug(data) {
-      console.log(Deno.inspect(data, { depth: 1 }));
-    },
-  },
 });
 
 // Default options for tests
diff --git a/tests/02_guild.test.ts b/tests/02_guild.ts
similarity index 87%
rename from tests/02_guild.test.ts
rename to tests/02_guild.ts
index a206cd463..a0df1855c 100644
--- a/tests/02_guild.test.ts
+++ b/tests/02_guild.ts
@@ -1,4 +1,4 @@
-import { defaultTestOptions, tempData } from "./01_main.test.ts";
+import { defaultTestOptions, tempData } from "./01_main.ts";
 import { assertExists, createServer, delay, Guild } from "./deps.ts";
 
 Deno.test({
diff --git a/tests/03_role.test.ts b/tests/03_role.ts
similarity index 94%
rename from tests/03_role.test.ts
rename to tests/03_role.ts
index 409773b94..5d685eb3c 100644
--- a/tests/03_role.test.ts
+++ b/tests/03_role.ts
@@ -1,4 +1,4 @@
-import { defaultTestOptions, tempData } from "./01_main.test.ts";
+import { defaultTestOptions, tempData } from "./01_main.ts";
 import {
   assertEquals,
   assertExists,
diff --git a/tests/04_channel.test.ts b/tests/04_channel.ts
similarity index 94%
rename from tests/04_channel.test.ts
rename to tests/04_channel.ts
index 91d0365e3..824f9e1cf 100644
--- a/tests/04_channel.test.ts
+++ b/tests/04_channel.ts
@@ -1,9 +1,9 @@
-import { defaultTestOptions, tempData } from "./01_main.test.ts";
+import { Channel } from "../src/api/structures/mod.ts";
+import { defaultTestOptions, tempData } from "./01_main.ts";
 import {
   assertEquals,
   assertExists,
   cache,
-  Channel,
   channelOverwriteHasPermission,
   createGuildChannel,
   delay,
diff --git a/tests/05_message.test.ts b/tests/05_message.ts
similarity index 91%
rename from tests/05_message.test.ts
rename to tests/05_message.ts
index 0d162a827..145e7ae87 100644
--- a/tests/05_message.test.ts
+++ b/tests/05_message.ts
@@ -1,4 +1,4 @@
-import { defaultTestOptions, tempData } from "./01_main.test.ts";
+import { defaultTestOptions, tempData } from "./01_main.ts";
 import { assertEquals, assertExists, getMessage, sendMessage } from "./deps.ts";
 
 Deno.test({
diff --git a/tests/06_cleanup.test.ts b/tests/06_cleanup.ts
similarity index 89%
rename from tests/06_cleanup.test.ts
rename to tests/06_cleanup.ts
index 396bfd6e4..92d3b4b2b 100644
--- a/tests/06_cleanup.test.ts
+++ b/tests/06_cleanup.ts
@@ -1,8 +1,8 @@
-import { defaultTestOptions, tempData } from "./01_main.test.ts";
+import { deleteMessageByID } from "../src/api/handlers/message.ts";
+import { defaultTestOptions, tempData } from "./01_main.ts";
 import {
   assertEquals,
   deleteChannel,
-  deleteMessageByID,
   deleteRole,
   deleteServer,
 } from "./deps.ts";
diff --git a/tests/mod.test.ts b/tests/mod.test.ts
new file mode 100644
index 000000000..a08f401d8
--- /dev/null
+++ b/tests/mod.test.ts
@@ -0,0 +1,6 @@
+import "./01_main.ts";
+import "./02_guild.ts";
+import "./03_role.ts";
+import "./04_channel.ts";
+import "./05_message.ts";
+import "./06_cleanup.ts";