diff --git a/src/yb/rpc/CMakeLists.txt b/src/yb/rpc/CMakeLists.txt
index aeff3ac55084..27e943fe7912 100644
--- a/src/yb/rpc/CMakeLists.txt
+++ b/src/yb/rpc/CMakeLists.txt
@@ -141,4 +141,6 @@ ADD_YB_TEST(rpc-test)
 ADD_YB_TEST(rpc_stub-test RUN_SERIAL true)
 ADD_YB_TEST(scheduler-test)
 ADD_YB_TEST(thread_pool-test)
-ADD_YB_TESTS(${RPC_ADDITIONAL_TESTS})
+if(RPC_ADDITIONAL_TESTS)
+  ADD_YB_TESTS(${RPC_ADDITIONAL_TESTS})
+endif()