diff --git a/tests/messages/remove_reaction.ts b/tests/messages/remove_reaction.ts
index 3bf96826c..722631769 100644
--- a/tests/messages/remove_reaction.ts
+++ b/tests/messages/remove_reaction.ts
@@ -1,9 +1,9 @@
 import { addReaction, cache, removeReaction, sendMessage } from "../../mod.ts";
-import { defaultTestOptions, tempData } from "../ws/start_bot.ts";
 import { assertEquals, assertExists } from "../deps.ts";
 import { delayUntil } from "../util/delay_until.ts";
+import { defaultTestOptions, tempData } from "../ws/start_bot.ts";
 
-async function ifItFailsBlameWolf(type: "getter" | "raw") {
+async function ifItFailsBlameWolf(type: "getter" | "raw", user = false) {
   const message = await sendMessage(tempData.channelId, "Hello World!");
 
   // Assertions
@@ -27,9 +27,14 @@ async function ifItFailsBlameWolf(type: "getter" | "raw") {
   assertEquals(await cache.messages.get(message.id)?.reactions?.length, 1);
 
   if (type === "raw") {
-    await removeReaction(message.channelId, message.id, "❤");
+    await removeReaction(
+      message.channelId,
+      message.id,
+      "❤",
+      user ? message.author.id : undefined,
+    );
   } else {
-    await message.removeReaction("❤");
+    await message.removeReaction("❤", user ? message.author.id : undefined);
   }
 
   // Delay the execution by 5 seconds to allow MESSAGE_REACTION_REMOVE_ALL event to be processed
@@ -57,3 +62,19 @@ Deno.test({
   },
   ...defaultTestOptions,
 });
+
+Deno.test({
+  name: "[message] remove a user reaction",
+  async fn() {
+    await ifItFailsBlameWolf("raw", true);
+  },
+  ...defaultTestOptions,
+});
+
+Deno.test({
+  name: "[message] message.removeReaction with user",
+  async fn() {
+    await ifItFailsBlameWolf("getter", true);
+  },
+  ...defaultTestOptions,
+});
diff --git a/tests/messages/remove_user_reaction.ts b/tests/messages/remove_user_reaction.ts
deleted file mode 100644
index 4c3859c03..000000000
--- a/tests/messages/remove_user_reaction.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { addReaction, cache, removeReaction, sendMessage } from "../../mod.ts";
-import { assertEquals, assertExists } from "../deps.ts";
-import { delayUntil } from "../util/delay_until.ts";
-import { defaultTestOptions, tempData } from "../ws/start_bot.ts";
-
-async function ifItFailsBlameWolf(type: "getter" | "raw") {
-  const message = await sendMessage(tempData.channelId, "Hello World!");
-
-  // Assertions
-  assertExists(message);
-  // Delay the execution by 5 seconds to allow MESSAGE_CREATE event to be processed
-  await delayUntil(10000, () => cache.messages.has(message.id));
-  // Make sure the message was created.
-  if (!cache.messages.has(message.id)) {
-    throw new Error("The message seemed to be sent but it was not cached.");
-  }
-
-  // Add reactions to the message
-  await addReaction(message.channelId, message.id, "❤");
-  // Delay the execution by 5 seconds to allow MESSAGE_REACTION_ALL event to be processed
-  await delayUntil(
-    10000,
-    () => cache.messages.get(message.id)?.reactions?.length === 1,
-  );
-
-  // Be sure that the message has the reactions
-  assertEquals(await cache.messages.get(message.id)?.reactions?.length, 1);
-
-  if (type === "raw") {
-    await removeReaction(
-      message.channelId,
-      message.id,
-      "❤",
-      message.author.id,
-    );
-  } else {
-    //await message.removeUserReaction("❤", message.author.id);
-  }
-
-  // Delay the execution by 5 seconds to allow MESSAGE_REACTION_REMOVE_ALL event to be processed
-  await delayUntil(
-    10000,
-    () => cache.messages.get(message.id)?.reactions === undefined,
-  );
-
-  // Check if the reactions has been deleted
-  assertEquals(await cache.messages.get(message.id)?.reactions, undefined);
-}
-
-Deno.test({
-  name: "[message] remove a user reaction",
-  async fn() {
-    await ifItFailsBlameWolf("raw");
-  },
-  ...defaultTestOptions,
-});
-/*
-Deno.test({
-  name: "[message] message.removeReaction()",
-  async fn() {
-    await ifItFailsBlameWolf("getter");
-  },
-  ...defaultTestOptions,
-});*/
diff --git a/tests/mod.ts b/tests/mod.ts
index e1240004b..34fbc07bd 100644
--- a/tests/mod.ts
+++ b/tests/mod.ts
@@ -48,7 +48,6 @@ import "./messages/add_reactions.ts";
 import "./messages/remove_all_reactions.ts";
 import "./messages/remove_reaction.ts";
 import "./messages/remove_reaction_emoji.ts";
-import "./messages/remove_user_reaction.ts";
 import "./messages/create_message.ts";
 import "./messages/delete_message.ts";
 import "./messages/delete_messages.ts";