diff --git a/tests/ResultValueRValue/CMakeLists.txt b/tests/ResultValue/CMakeLists.txt
similarity index 80%
rename from tests/ResultValueRValue/CMakeLists.txt
rename to tests/ResultValue/CMakeLists.txt
index e28f03e..d6c2250 100644
--- a/tests/ResultValueRValue/CMakeLists.txt
+++ b/tests/ResultValue/CMakeLists.txt
@@ -14,25 +14,25 @@
 
 cmake_minimum_required(VERSION 3.2)
 
-project(ResultValueRValue)
+project(ResultValue)
 
 set(HEADERS
 )
 
 set(SOURCES
-  ResultValueRValue.cpp
+  ResultValue.cpp
 )
 
 source_group(headers FILES ${HEADERS})
 source_group(sources FILES ${SOURCES})
 
-add_library(ResultValueRValue
+add_library(ResultValue
   ${HEADERS}
   ${SOURCES}
 )
 
 if (UNIX)
-  target_link_libraries(ResultValueRValue "-ldl")
+  target_link_libraries(ResultValue "-ldl")
 endif()
 
-set_target_properties(ResultValueRValue PROPERTIES FOLDER "Tests")
+set_target_properties(ResultValue PROPERTIES FOLDER "Tests")
diff --git a/tests/ResultValueRValue/ResultValueRValue.cpp b/tests/ResultValue/ResultValue.cpp
similarity index 82%
rename from tests/ResultValueRValue/ResultValueRValue.cpp
rename to tests/ResultValue/ResultValue.cpp
index 73388a1..c33b24b 100644
--- a/tests/ResultValueRValue/ResultValueRValue.cpp
+++ b/tests/ResultValue/ResultValue.cpp
@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// VulkanHpp Test: Compile only test for issue 589.
+// VulkanHpp Tests : ResultValue
+//                   Compile-test for ResultValue
 
 #define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
 
@@ -20,18 +21,19 @@
 
 VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
 
+// Compile only test for issue 589.
+void test_conversion()
+{
 #if defined(VULKAN_DISABLE_IMPLICIT_RESULT_VALUE_CAST)
   static_assert(false, "Conversions not enabled");
 #endif
 
-void as_value(int)  {}
-void as_ref(int&) {}
-void as_cref(const int&) {}
-void as_rvref(int&&)  {}
-void as_crvref(const int&&)  {}
+  void as_value(int);
+  void as_ref(int&);
+  void as_cref(const int&);
+  void as_rvref(int&&);
+  void as_crvref(const int&&);
 
-void test()
-{
   using result = vk::ResultValue<int>;
 
   auto val        = result {vk::Result{}, 42};