diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1071feaa1..3e71bf498 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3076,6 +3076,7 @@ if(SDL_TEST)
   set_target_properties(SDL2_test PROPERTIES
       EXPORT_NAME SDL2test)
   target_include_directories(SDL2_test PUBLIC
+      "$<BUILD_INTERFACE:${SDL2_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>>"
       "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>"
       $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SDL2>)
   target_link_libraries(SDL2_test PRIVATE ${EXTRA_TEST_LIBS})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 04ad3a1df..d4fc5c42b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,10 +6,6 @@ if(SDL_INSTALL_TESTS)
     include(GNUInstallDirs)
 endif()
 
-# Global settings for all of the test targets
-# FIXME: is this wrong?
-remove_definitions(-DUSING_GENERATED_CONFIG_H)
-
 if(PSP)
     link_libraries(
         SDL2main