diff --git a/cmake/FindJsonRpcCpp.cmake b/cmake/FindJsonRpcCpp.cmake
index 221180337..eecf518f8 100644
--- a/cmake/FindJsonRpcCpp.cmake
+++ b/cmake/FindJsonRpcCpp.cmake
@@ -7,6 +7,8 @@
 # This module defines
 #  JSON_RCP_CPP_INCLUDE_DIRS, where to find header, etc.
 #  JSON_RCP_CPP_LIBRARIES, the libraries needed to use json-rpc-cpp.
+#  JSON_RPC_CPP_SERVER_LIBRARIES, the libraries needed to use json-rpc-cpp-server
+#  JSON_RPC_CPP_CLIENT_LIBRARIES, the libraries needed to use json-rpc-cpp-client
 #  JSON_RCP_CPP_FOUND, If false, do not try to use json-rpc-cpp.
 
 # only look in default directories
@@ -35,8 +37,11 @@ find_library(
 	DOC "json-rpc-cpp client library"
 )
 
-# message (" - json-rcp-cpp header : ${JSON_RPC_CPP_INCLUDE_DIRS}")
-# message (" - json-rcp-cpp lib    : ${JSON_RPC_CPP_LIBRARIES}")
+# these are the variables to be uses by the calling script
+set (JSON_RPC_CPP_INCLUDE_DIRS ${JSON_RPC_CPP_INCLUDE_DIR})
+set (JSON_RPC_CPP_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP_SERVER_LIBRARY} ${JSON_RPC_CPP_CLIENT_LIBRARY})
+set (JSON_RPC_CPP_SERVER_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP_SERVER_LIBRARY})
+set (JSON_RPC_CPP_CLIENT_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP_CLIENT_LIBRARY})
 
 # handle the QUIETLY and REQUIRED arguments and set JSON_RPC_CPP_FOUND to TRUE
 # if all listed variables are TRUE, hide their existence from configuration view
@@ -45,9 +50,3 @@ find_package_handle_standard_args(json_rpc_cpp DEFAULT_MSG
     JSON_RPC_CPP_COMMON_LIBRARY JSON_RPC_CPP_SERVER_LIBRARY JSON_RPC_CPP_CLIENT_LIBRARY JSON_RPC_CPP_INCLUDE_DIR)                             
 mark_as_advanced (JSON_RPC_CPP_COMMON_LIBRARY JSON_RPC_CPP_SERVER_LIBRARY JSON_RPC_CPP_CLIENT_LIBRARY JSON_RPC_CPP_INCLUDE_DIR)
 
-# these are the variables to be uses by the calling script
-set (JSON_RPC_CPP_INCLUDE_DIRS ${JSON_RPC_CPP_INCLUDE_DIR})
-set (JSON_RPC_CPP_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP_SERVER_LIBRARY} ${JSON_RPC_CPP_CLIENT_LIBRARY})
-
-# message (" - json-rcp-cpp header : ${JSON_RPC_CPP_INCLUDE_DIRS}")
-# message (" - json-rcp-cpp lib    : ${JSON_RPC_CPP_LIBRARIES}")
diff --git a/libqethereum/CMakeLists.txt b/libqethereum/CMakeLists.txt
index e2c8f9a05..683bfec56 100644
--- a/libqethereum/CMakeLists.txt
+++ b/libqethereum/CMakeLists.txt
@@ -33,8 +33,7 @@ target_link_libraries(${EXECUTABLE} Qt5::Widgets)
 target_link_libraries(${EXECUTABLE} Qt5::Network)
 target_link_libraries(${EXECUTABLE} Qt5::Quick)
 target_link_libraries(${EXECUTABLE} Qt5::Qml)
-target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_COMMON_LIBRARY})
-target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARY})
+target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ethereum)
 target_link_libraries(${EXECUTABLE} secp256k1)
 
diff --git a/libweb3jsonrpc/CMakeLists.txt b/libweb3jsonrpc/CMakeLists.txt
index 9a0771ef7..5068ede56 100644
--- a/libweb3jsonrpc/CMakeLists.txt
+++ b/libweb3jsonrpc/CMakeLists.txt
@@ -25,8 +25,7 @@ endif()
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_COMMON_LIBRARY})
-target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARY})
+target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARIES})
 
 if (MINIUPNPC_FOUND)
 	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARIES})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 73003e805..7e618f7ea 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,19 +12,19 @@ file(GLOB HEADERS "*.h")
 add_executable(testeth ${SRC_LIST} ${HEADERS})
 add_executable(createRandomTest createRandomTest.cpp vm.cpp TestHelper.cpp)
 
+target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE})
+target_link_libraries(testeth ${CURL_LIBRARIES})
 target_link_libraries(testeth ethereum)
 target_link_libraries(testeth ethcore)
 target_link_libraries(testeth secp256k1)
 target_link_libraries(testeth solidity)
 target_link_libraries(testeth webthree)
-target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE})
-target_link_libraries(testeth ${CURL_LIBRARIES})
 
 if (JSONRPC)
 	target_link_libraries(testeth web3jsonrpc)
-	target_link_libraries(testeth ${JSON_RPC_CPP_CLIENT_LIBRARY})
+	target_link_libraries(testeth ${JSON_RPC_CPP_CLIENT_LIBRARIES})
 endif()
 
+target_link_libraries(createRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE})
 target_link_libraries(createRandomTest ethereum)
 target_link_libraries(createRandomTest ethcore)
-target_link_libraries(createRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE})