diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6e24e3347..f74751126 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,6 +33,7 @@ endif()
 
 if (SOLIDITY)
 	add_subdirectory(libsolidity)
+	add_subdirectory(contracts)
 endif ()
 if (JSONRPC)
 add_subdirectory(libweb3jsonrpc)
diff --git a/test/contracts/CMakeLists.txt b/test/contracts/CMakeLists.txt
new file mode 100644
index 000000000..3ceda13b0
--- /dev/null
+++ b/test/contracts/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_policy(SET CMP0015 NEW)
+
+aux_source_directory(. SRCS)
+
+add_sources(${SRCS})
diff --git a/test/libsolidity/SolidityFixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp
similarity index 100%
rename from test/libsolidity/SolidityFixedFeeRegistrar.cpp
rename to test/contracts/FixedFeeRegistrar.cpp
diff --git a/test/libsolidity/SolidityWallet.cpp b/test/contracts/Wallet.cpp
similarity index 100%
rename from test/libsolidity/SolidityWallet.cpp
rename to test/contracts/Wallet.cpp