diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8adaad3..05feb40 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,17 +1,2 @@
 
-add_executable(base58_encode_test base58_encode.cpp)
-target_link_libraries(base58_encode_test PRIVATE ${LIB_NAME})
-
-add_executable(is_base58_test is_base58.cpp)
-target_link_libraries(is_base58_test PRIVATE ${LIB_NAME})
-
-# define tests
-add_test(
-  NAME base58_encode_test
-  COMMAND $<TARGET_FILE:base58_encode_test>
-)
-
-add_test(
-  NAME is_base58_test
-  COMMAND $<TARGET_FILE:is_base58_test>
-)
\ No newline at end of file
+add_subdirectory( base58 )
diff --git a/tests/base58/CMakeLists.txt b/tests/base58/CMakeLists.txt
new file mode 100644
index 0000000..8adaad3
--- /dev/null
+++ b/tests/base58/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+add_executable(base58_encode_test base58_encode.cpp)
+target_link_libraries(base58_encode_test PRIVATE ${LIB_NAME})
+
+add_executable(is_base58_test is_base58.cpp)
+target_link_libraries(is_base58_test PRIVATE ${LIB_NAME})
+
+# define tests
+add_test(
+  NAME base58_encode_test
+  COMMAND $<TARGET_FILE:base58_encode_test>
+)
+
+add_test(
+  NAME is_base58_test
+  COMMAND $<TARGET_FILE:is_base58_test>
+)
\ No newline at end of file
diff --git a/tests/base58_encode.cpp b/tests/base58/base58_encode.cpp
similarity index 100%
rename from tests/base58_encode.cpp
rename to tests/base58/base58_encode.cpp
diff --git a/tests/is_base58.cpp b/tests/base58/is_base58.cpp
similarity index 100%
rename from tests/is_base58.cpp
rename to tests/base58/is_base58.cpp