diff --git a/CMakeLists.txt b/CMakeLists.txt
index b830d454cf1e0c0dfda16c9722e4dd1fa874c85a..bbc10dc99ccde1389ff99bfd38e3d8eaa193f20b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,10 @@ list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 
 include( VistaCommon )
 
+if( NOT DEFINED ITA_VANET_WITH_TESTS )
+	set( ITA_VANET_WITH_TESTS OFF CACHE BOOL "Build VANet with tests" )
+endif( NOT DEFINED ITA_VANET_WITH_TESTS )
+
 if( NOT DEFINED ITA_VA_BUILD_STATIC )
 	set( ITA_VA_BUILD_STATIC OFF CACHE BOOL "Build static VA libs" )
 endif( NOT DEFINED ITA_VA_BUILD_STATIC )
@@ -63,5 +67,7 @@ if( ITA_VANET_INSTALL_WITH_DLLS OR ITA_VA_INSTALL_WITH_DLLS )
 endif()
 
 # tests
-set( VANET_COMMON_BUILD TRUE )
-add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
+if( ITA_VA_WITH_TESTS OR ITA_VANET_WITH_TESTS )
+	set( VANET_COMMON_BUILD TRUE )
+	add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
+endif( ITA_VA_WITH_TESTS OR ITA_VANET_WITH_TESTS )
diff --git a/tests/VANetTestClient/CMakeLists.txt b/tests/VANetTestClient/CMakeLists.txt
index e504542132866a6949c11d0ddb7ce2710068dcb9..032f2b6ece34cd85bd3a0c7874b24bbcb95b2e15 100644
--- a/tests/VANetTestClient/CMakeLists.txt
+++ b/tests/VANetTestClient/CMakeLists.txt
@@ -39,4 +39,4 @@ vista_configure_app( VANetClientTest )
 vista_install( VANetClientTest )
 vista_create_default_info_file( VANetClientTest )
 
-set_property( TARGET VANetClientTest PROPERTY FOLDER "ITATests/VANet" )
+set_property( TARGET VANetClientTest PROPERTY FOLDER "VA/Tests/VANet" )
diff --git a/tests/VANetTestServer/CMakeLists.txt b/tests/VANetTestServer/CMakeLists.txt
index 3749f629a7d5d4c05ec7f3308ee7a44ad4e197b1..cff22caae54598a81ba9f878d5602f66a0449ac4 100644
--- a/tests/VANetTestServer/CMakeLists.txt
+++ b/tests/VANetTestServer/CMakeLists.txt
@@ -21,4 +21,4 @@ vista_configure_app( VANetServerTest )
 vista_install( VANetServerTest )
 vista_create_default_info_file( VANetServerTest )
 
-set_property( TARGET VANetServerTest PROPERTY FOLDER "ITATests/VANet" )
+set_property( TARGET VANetServerTest PROPERTY FOLDER "VA/Tests/VANet" )