diff --git a/CMakeLists.txt b/CMakeLists.txt
index d57317f5..86e80ee0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,9 +97,6 @@ if (WITH_TESTING)
   add_subdirectory(tests)
 endif (WITH_TESTING)
 
-if (WITH_BENCHMARKS)
-    add_subdirectory(benchmarks)
-endif (WITH_BENCHMARKS)	
 
 message(STATUS "********************************************")
 message(STATUS "********** ${PROJECT_NAME} build options : **********")
diff --git a/DefineOptions.cmake b/DefineOptions.cmake
index 17abbd15..d82588cb 100644
--- a/DefineOptions.cmake
+++ b/DefineOptions.cmake
@@ -14,3 +14,6 @@ option(WITH_BENCHMARKS "Build benchmarks tools" OFF)
 if (WITH_TESTING)
   set(WITH_STATIC_LIB ON)
 endif (WITH_TESTING)
+if(WITH_BENCHMARKS)
+  set(WITH_TESTING ON)
+endif(WITH_BENCHMARKS)
\ No newline at end of file
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 56980abe..da1fb412 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -32,3 +32,8 @@ add_subdirectory(unittests)
 if (WITH_CLIENT_TESTING)
     add_subdirectory(client)
 endif (WITH_CLIENT_TESTING)
+
+if (WITH_BENCHMARKS)
+    add_subdirectory(benchmarks)
+endif (WITH_BENCHMARKS)	
+
diff --git a/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt
similarity index 100%
rename from benchmarks/CMakeLists.txt
rename to tests/benchmarks/CMakeLists.txt
diff --git a/benchmarks/bench1.sh b/tests/benchmarks/bench1.sh
similarity index 100%
rename from benchmarks/bench1.sh
rename to tests/benchmarks/bench1.sh
diff --git a/benchmarks/bench2.sh b/tests/benchmarks/bench2.sh
similarity index 100%
rename from benchmarks/bench2.sh
rename to tests/benchmarks/bench2.sh
diff --git a/benchmarks/bench_scp.c b/tests/benchmarks/bench_scp.c
similarity index 100%
rename from benchmarks/bench_scp.c
rename to tests/benchmarks/bench_scp.c
diff --git a/benchmarks/benchmarks.c b/tests/benchmarks/benchmarks.c
similarity index 100%
rename from benchmarks/benchmarks.c
rename to tests/benchmarks/benchmarks.c
diff --git a/benchmarks/benchmarks.h b/tests/benchmarks/benchmarks.h
similarity index 100%
rename from benchmarks/benchmarks.h
rename to tests/benchmarks/benchmarks.h
diff --git a/benchmarks/latency.c b/tests/benchmarks/latency.c
similarity index 100%
rename from benchmarks/latency.c
rename to tests/benchmarks/latency.c