diff --git a/configure.ac b/configure.ac
index 3728e4c..7508135 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,13 +138,17 @@ if test "x$with_bundled_catch" = xyes; then
     catch_summary="bundled; $catch_CFLAGS $catch_LIBS"
 else
     SAVE_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="-std=c++11 $CPPFLAGS -I/usr/include/catch"
+    CPPFLAGS="-std=c++17 $CPPFLAGS -I/usr/include/catch2"
     AC_LANG_PUSH([C++])
-    AC_CHECK_HEADER([catch.hpp], [], [AC_MSG_FAILURE(catch.hpp not found or not
-        usable. Re-run with --with-bundled-catch to use the bundled library.)])
+	AC_CHECK_HEADER([catch_test_macros.hpp],
+	[catch_CFLAGS="-I/usr/include/catch2 -DHAVE_CATCH2_V3"
+	catch_LIBS="-lCatch2Main -lCatch2"],
+        [AC_CHECK_HEADER([catch.hpp],
+	[catch_CFLAGS="-I/usr/include/catch2"
+	catch_LIBS=""],
+        [AC_MSG_FAILURE(Catch2 not found or not usable. Re-run with --with-bundled-catch to use the bundled library.)]
+        )])
     AC_LANG_POP
-    catch_CFLAGS="-I/usr/include/catch"
-    catch_LIBS=""
     CPPFLAGS=$SAVE_CPPFLAGS
     catch_summary="system-wide;
     $catch_CFLAGS $catch_LIBS"
@@ -165,7 +169,7 @@ AC_ARG_ENABLE(
 )
 
 CXXFLAGS=" $EXTERNAL_CXXFLAGS"
-CXXFLAGS+=" -std=c++11"
+CXXFLAGS+=" -std=c++17"
 CXXFLAGS+=" -pedantic"
 CXXFLAGS+=" -Wno-unknown-pragmas"
 CXXFLAGS+=" -Wall"
diff --git a/src/Tests/Makefile.am b/src/Tests/Makefile.am
index 54c1765..176bbb2 100644
--- a/src/Tests/Makefile.am
+++ b/src/Tests/Makefile.am
@@ -43,3 +43,6 @@ test_unit_SOURCES=\
     ../NotifierCLI.cpp \
     ../Serializer.hpp \
     ../Serializer.cpp
+
+test_unit_LDADD = \
+    $(catch_LIBS)
diff --git a/src/Tests/Unit/test_notifier_cli.cpp b/src/Tests/Unit/test_notifier_cli.cpp
index d77cd71..e0efb1e 100644
--- a/src/Tests/Unit/test_notifier_cli.cpp
+++ b/src/Tests/Unit/test_notifier_cli.cpp
@@ -1,6 +1,10 @@
 #include "NotifierCLI.hpp"
 
+#ifdef HAVE_CATCH2_V3
+#include <catch_test_macros.hpp>
+#else
 #include <catch.hpp>
+#endif
 
 using namespace usbguardNotifier;
 
diff --git a/src/Tests/main.cpp b/src/Tests/main.cpp
index b3143fb..1dfc87b 100644
--- a/src/Tests/main.cpp
+++ b/src/Tests/main.cpp
@@ -1,2 +1,6 @@
+#ifdef HAVE_CATCH2_V3
+#include <catch_test_macros.hpp>
+#else
 #define CATCH_CONFIG_MAIN
 #include <catch.hpp>
+#endif