diff --git a/rct_examples/CMakeLists.txt b/rct_examples/CMakeLists.txt
index 1097e261..eb054651 100644
--- a/rct_examples/CMakeLists.txt
+++ b/rct_examples/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.5.0)
 project(rct_examples)
+set (CMAKE_CXX_STANDARD 14)
 
-add_compile_options(-std=c++11 -Wall -Wextra)
+add_compile_options(-Wall -Wextra)
 
 find_package(rct_optimizations REQUIRED)
 find_package(rct_image_tools REQUIRED)
diff --git a/rct_optimizations/CMakeLists.txt b/rct_optimizations/CMakeLists.txt
index b513398f..89e817e6 100644
--- a/rct_optimizations/CMakeLists.txt
+++ b/rct_optimizations/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.5.0)
 project(rct_optimizations VERSION 0.1.0 LANGUAGES CXX)
+set (CMAKE_CXX_STANDARD 14)
 
 find_package(rct_common REQUIRED)
 find_package(Boost REQUIRED)
diff --git a/rct_ros_tools/CMakeLists.txt b/rct_ros_tools/CMakeLists.txt
index fdc70bc1..b9456b91 100644
--- a/rct_ros_tools/CMakeLists.txt
+++ b/rct_ros_tools/CMakeLists.txt
@@ -89,12 +89,9 @@ target_link_libraries(${PROJECT_NAME}_cmd
 
 if(CATKIN_ENABLE_TESTING)
   find_package(rostest REQUIRED)
-  find_package(GTest REQUIRED)
-  add_rostest_gtest(${PROJECT_NAME}_target_loader_utest test/target_loader.test test/target_loader_utest.cpp)
+  catkin_add_gtest(${PROJECT_NAME}_target_loader_utest test/target_loader.test test/target_loader_utest.cpp)
   target_link_libraries(${PROJECT_NAME}_target_loader_utest
     ${PROJECT_NAME}_data_loader
-    GTest::GTest
-    GTest::Main
     ${catkin_LIBRARIES}
   )
 endif()
diff --git a/rct_ros_tools/package.xml b/rct_ros_tools/package.xml
index e08aadbd..e180b76d 100644
--- a/rct_ros_tools/package.xml
+++ b/rct_ros_tools/package.xml
@@ -19,5 +19,7 @@
   <depend>std_srvs</depend>
   <depend>tf2_ros</depend>
   <depend>yaml-cpp</depend>
+  <test_depend>rosunit</test_depend>
+
 
 </package>