diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index f130f8d..afae69d 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,4 +1,5 @@
 SET(MARIADBCPP_PUBLIC_API   ${CMAKE_SOURCE_DIR}/include/Driver.h
+                            ${CMAKE_SOURCE_DIR}/include/DriverManager.h
                             ${CMAKE_SOURCE_DIR}/include/Connection.h
                             ${CMAKE_SOURCE_DIR}/include/Statement.h
                             ${CMAKE_SOURCE_DIR}/include/PreparedStatement.h
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index da85d85..0f48c11 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -89,6 +89,6 @@ ADD_TEST(test_resultset resultset)
 SET_TESTS_PROPERTIES(test_parametermetadata test_preparedstatement test_resultsetmetadata test_connection PROPERTIES TIMEOUT 120 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 # With remote SkySQL server, compliance tend to timeout
 SET_TESTS_PROPERTIES(static_test driver_test PROPERTIES TIMEOUT 150 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-SET_TESTS_PROPERTIES(compliance test_databasemetadata PROPERTIES TIMEOUT 450 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+SET_TESTS_PROPERTIES(compliance test_databasemetadata test_resultset PROPERTIES TIMEOUT 450 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 MESSAGE(STATUS "Configuring test cases")