diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbe321d..ae0c0df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,7 +204,7 @@ endfunction()
 
 function(add_cc_tests _format)
     add_cc_tests_target(${_format} simple_test)
-    if (NOT _format STREQUAL "256" AND NOT _format STREQUAL "64r")
+    if (NOT _format STREQUAL "256")
         add_cc_tests_target(${_format} setbounds_test)
         add_cc_tests_target(${_format} random_inputs_test)
     endif()
diff --git a/test/random_inputs_test_64r.cpp b/test/random_inputs_test_64r.cpp
new file mode 100644
index 0000000..edd32b2
--- /dev/null
+++ b/test/random_inputs_test_64r.cpp
@@ -0,0 +1 @@
+#include "random_inputs_test_common.cpp"
diff --git a/test/setbounds_test_64r.cpp b/test/setbounds_test_64r.cpp
new file mode 100644
index 0000000..814c947
--- /dev/null
+++ b/test/setbounds_test_64r.cpp
@@ -0,0 +1,3 @@
+// TODO: Generate test cases from sail
+
+#include "setbounds_test_common.cpp"