diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1f93675c3..886506394 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -484,16 +484,16 @@ if(BUILD_TESTING)
   endif()
 
   if(run_inlines_hidden_test)
-    add_test(VisibilityInlinesHidden ${CMAKE_CTEST_COMMAND}
+    add_test(Visibility ${CMAKE_CTEST_COMMAND}
       --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/VisibilityInlinesHidden"
-      "${CMake_BINARY_DIR}/Tests/VisibilityInlinesHidden"
+      "${CMake_SOURCE_DIR}/Tests/Visibility"
+      "${CMake_BINARY_DIR}/Tests/Visibility"
       ${build_generator_args}
-      --build-project VisibilityInlinesHidden
+      --build-project Visibility
       --build-options ${build_options}
     )
     list(APPEND TEST_BUILD_DIRS
-      "${CMake_BINARY_DIR}/Tests/VisibilityInlinesHidden"
+      "${CMake_BINARY_DIR}/Tests/Visibility"
     )
   endif()
 
diff --git a/Tests/VisibilityInlinesHidden/CMakeLists.txt b/Tests/Visibility/CMakeLists.txt
similarity index 84%
rename from Tests/VisibilityInlinesHidden/CMakeLists.txt
rename to Tests/Visibility/CMakeLists.txt
index 8ebc39c75..df756300f 100644
--- a/Tests/VisibilityInlinesHidden/CMakeLists.txt
+++ b/Tests/Visibility/CMakeLists.txt
@@ -1,6 +1,5 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(VisibilityInlinesHidden)
+cmake_minimum_required(VERSION 3.2)
+project(Visibility)
 
 add_library(inlines_hidden SHARED foo.cpp bar.c)
 set_property(TARGET inlines_hidden PROPERTY VISIBILITY_INLINES_HIDDEN ON)
diff --git a/Tests/VisibilityInlinesHidden/bar.c b/Tests/Visibility/bar.c
similarity index 100%
rename from Tests/VisibilityInlinesHidden/bar.c
rename to Tests/Visibility/bar.c
diff --git a/Tests/VisibilityInlinesHidden/foo.cpp b/Tests/Visibility/foo.cpp
similarity index 100%
rename from Tests/VisibilityInlinesHidden/foo.cpp
rename to Tests/Visibility/foo.cpp
diff --git a/Tests/VisibilityInlinesHidden/verify.cmake b/Tests/Visibility/verify.cmake
similarity index 100%
rename from Tests/VisibilityInlinesHidden/verify.cmake
rename to Tests/Visibility/verify.cmake