diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 288ae60adc..8fb9ab3f3d 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -59,10 +59,6 @@ if(NON_ASCII_BDIR AND WIN32)
   set(ALLOW_WRAP_CPP FALSE)
 endif()
 
-# -- Test
-# OBJECT libraries
-add_subdirectory(objectLibrary)
-
 # -- Test
 # MacOS Framework
 if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index e873d0624b..9e49153f54 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -24,3 +24,4 @@ if(QT_TEST_ALLOW_QT_MACROS)
   ADD_AUTOGEN_TEST(MocCMP0071)
 endif()
 ADD_AUTOGEN_TEST(UicInclude uicInclude)
+ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
diff --git a/Tests/QtAutogen/objectLibrary/CMakeLists.txt b/Tests/QtAutogen/ObjectLibrary/CMakeLists.txt
similarity index 83%
rename from Tests/QtAutogen/objectLibrary/CMakeLists.txt
rename to Tests/QtAutogen/ObjectLibrary/CMakeLists.txt
index 9b29a4075c..088a24c611 100644
--- a/Tests/QtAutogen/objectLibrary/CMakeLists.txt
+++ b/Tests/QtAutogen/ObjectLibrary/CMakeLists.txt
@@ -1,3 +1,7 @@
+cmake_minimum_required(VERSION 3.10)
+project(ObjectLibrary)
+include("../AutogenTest.cmake")
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
diff --git a/Tests/QtAutogen/objectLibrary/a/CMakeLists.txt b/Tests/QtAutogen/ObjectLibrary/a/CMakeLists.txt
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/a/CMakeLists.txt
rename to Tests/QtAutogen/ObjectLibrary/a/CMakeLists.txt
diff --git a/Tests/QtAutogen/objectLibrary/a/classa.cpp b/Tests/QtAutogen/ObjectLibrary/a/classa.cpp
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/a/classa.cpp
rename to Tests/QtAutogen/ObjectLibrary/a/classa.cpp
diff --git a/Tests/QtAutogen/objectLibrary/a/classa.h b/Tests/QtAutogen/ObjectLibrary/a/classa.h
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/a/classa.h
rename to Tests/QtAutogen/ObjectLibrary/a/classa.h
diff --git a/Tests/QtAutogen/objectLibrary/b/classb.cpp b/Tests/QtAutogen/ObjectLibrary/b/classb.cpp
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/b/classb.cpp
rename to Tests/QtAutogen/ObjectLibrary/b/classb.cpp
diff --git a/Tests/QtAutogen/objectLibrary/b/classb.h b/Tests/QtAutogen/ObjectLibrary/b/classb.h
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/b/classb.h
rename to Tests/QtAutogen/ObjectLibrary/b/classb.h
diff --git a/Tests/QtAutogen/objectLibrary/main.cpp b/Tests/QtAutogen/ObjectLibrary/main.cpp
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/main.cpp
rename to Tests/QtAutogen/ObjectLibrary/main.cpp