diff --git a/grapher/tests/CMakeLists.txt b/grapher/tests/CMakeLists.txt
index e45b7fb..f911121 100644
--- a/grapher/tests/CMakeLists.txt
+++ b/grapher/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 file(GLOB_RECURSE SOURCES grapher/*.cpp)
 
-add_executable(grapher-tests ${SOURCES} main.cpp)
-target_link_libraries(grapher-tests PRIVATE Catch2::Catch2 grapher)
+add_executable(grapher-tests ${SOURCES})
+target_link_libraries(grapher-tests PRIVATE Catch2::Catch2WithMain grapher)
 
 add_custom_target(test-grapher grapher-tests)
 add_dependencies(test-all test-grapher)
diff --git a/grapher/tests/grapher/predicates.cpp b/grapher/tests/grapher/predicates.cpp
index ae4e979..4896151 100644
--- a/grapher/tests/grapher/predicates.cpp
+++ b/grapher/tests/grapher/predicates.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <grapher/predicates.hpp>
 
diff --git a/grapher/tests/grapher/utils/cli.cpp b/grapher/tests/grapher/utils/cli.cpp
index f615749..96821ce 100644
--- a/grapher/tests/grapher/utils/cli.cpp
+++ b/grapher/tests/grapher/utils/cli.cpp
@@ -1 +1 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
diff --git a/grapher/tests/grapher/utils/json.cpp b/grapher/tests/grapher/utils/json.cpp
index f615749..96821ce 100644
--- a/grapher/tests/grapher/utils/json.cpp
+++ b/grapher/tests/grapher/utils/json.cpp
@@ -1 +1 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
diff --git a/grapher/tests/grapher/utils/math.cpp b/grapher/tests/grapher/utils/math.cpp
index 479ad76..b63a119 100644
--- a/grapher/tests/grapher/utils/math.cpp
+++ b/grapher/tests/grapher/utils/math.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <vector>
 
diff --git a/grapher/tests/main.cpp b/grapher/tests/main.cpp
deleted file mode 100644
index 4ed06df..0000000
--- a/grapher/tests/main.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>