diff --git a/tests/cd.cpp b/tests/cd.cpp
index bcc1dab..ffa4bbf 100644
--- a/tests/cd.cpp
+++ b/tests/cd.cpp
@@ -275,6 +275,6 @@
                 input = "cd example:twoKeyList[number=4][name=abcd]";
             }
         }
-        REQUIRE_THROWS(parser.parseCommand(input, errorStream));
+        REQUIRE_THROWS_AS(parser.parseCommand(input, errorStream), InvalidCommandException&);
     }
 }
diff --git a/tests/leaf_editing.cpp b/tests/leaf_editing.cpp
index d8f21db..a0eeed3 100644
--- a/tests/leaf_editing.cpp
+++ b/tests/leaf_editing.cpp
@@ -152,6 +152,6 @@
             }
         }
 
-        REQUIRE_THROWS(parser.parseCommand(input, errorStream));
+        REQUIRE_THROWS_AS(parser.parseCommand(input, errorStream), InvalidCommandException&);
     }
 }
diff --git a/tests/ls.cpp b/tests/ls.cpp
index e3287ee..47d28ed 100644
--- a/tests/ls.cpp
+++ b/tests/ls.cpp
@@ -172,6 +172,6 @@
                 input = "lssecond:a";
         }
 
-        REQUIRE_THROWS(parser.parseCommand(input, errorStream));
+        REQUIRE_THROWS_AS(parser.parseCommand(input, errorStream), InvalidCommandException&);
     }
 }
diff --git a/tests/presence_containers.cpp b/tests/presence_containers.cpp
index 91dc234..5a43ce9 100644
--- a/tests/presence_containers.cpp
+++ b/tests/presence_containers.cpp
@@ -106,7 +106,7 @@
             input = "list[quote='lol']";
         }
 
-        REQUIRE_THROWS(parser.parseCommand("create " + input, errorStream));
-        REQUIRE_THROWS(parser.parseCommand("delete " + input, errorStream));
+        REQUIRE_THROWS_AS(parser.parseCommand("create " + input, errorStream), InvalidCommandException&);
+        REQUIRE_THROWS_AS(parser.parseCommand("delete " + input, errorStream), InvalidCommandException&);
     }
 }