diff --git a/server/core/test/CMakeLists.txt b/server/core/test/CMakeLists.txt
index 0cff62772..b42bbbfe7 100644
--- a/server/core/test/CMakeLists.txt
+++ b/server/core/test/CMakeLists.txt
@@ -58,3 +58,4 @@ set_tests_properties(testMySQLUsers
   TestAdminUsers
   TestMemlog 
   TestFeedback PROPERTIES ENVIRONMENT MAXSCALE_HOME=${CMAKE_BINARY_DIR}/)
+set_tests_properties(TestFeedback PROPERTIES TIMEOUT 30)