diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fb7d4bdd..f15d537bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -555,7 +555,7 @@ target_include_directories(notcurses-tester
 )
 target_link_libraries(notcurses-tester
   PRIVATE
-    notcurses
+    notcurses++
     "${TERMINFO_LIBRARIES}"
 )
 target_compile_definitions(notcurses-tester
diff --git a/tests/exceptions.cpp b/tests/exceptions.cpp
new file mode 100644
index 000000000..294729fa0
--- /dev/null
+++ b/tests/exceptions.cpp
@@ -0,0 +1,10 @@
+#define NCPP_EXCEPTIONS_PLEASE
+#include "main.h"
+
+TEST_CASE("Exceptions") {
+
+  SUBCASE("Notcurses") {
+    CHECK_THROWS_AS(ncpp::NotCurses::get_instance(), ncpp::invalid_state_error);
+  }
+
+}
diff --git a/tests/fills.cpp b/tests/fills.cpp
index 8010d718d..d2bc06e76 100644
--- a/tests/fills.cpp
+++ b/tests/fills.cpp
@@ -1,6 +1,5 @@
 #include <array>
 #include <cstdlib>
-#include "internal.h"
 #include "main.h"
 
 TEST_CASE("Fills") {
diff --git a/tests/main.cpp b/tests/main.cpp
index 8741c8780..193aea3a6 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,4 +1,5 @@
 #define DOCTEST_CONFIG_IMPLEMENT
+#include "main.h"
 #include <term.h>
 #include <fcntl.h>
 #include <clocale>
@@ -9,8 +10,6 @@
 #include <termios.h>
 #include <filesystem>
 #include <langinfo.h>
-#include "version.h"
-#include "main.h"
 
 static const char* datadir = NOTCURSES_SHARE;
 
diff --git a/tests/main.h b/tests/main.h
index 0ba9abdc5..500ed8e9a 100644
--- a/tests/main.h
+++ b/tests/main.h
@@ -2,9 +2,11 @@
 #define NOTCURSES_TEST_MAIN
 
 #include <unistd.h>
-#include <doctest/doctest.h>
 #include "version.h"
+#include <doctest/doctest.h>
 #include <notcurses/notcurses.h>
+#include <ncpp/NotCurses.hh>
+#include "internal.h"
 
 auto find_data(const char* datum) -> char*;
 auto enforce_utf8() -> bool;