diff --git a/Makefile b/Makefile
index 22ecdde085..2f80eed5bd 100644
--- a/Makefile
+++ b/Makefile
@@ -346,6 +346,12 @@ test-cpp: build-cpp-with-unittest
 	@echo "Running cpp unittests..."
 	@(env bash $(PWD)/scripts/run_cpp_unittest.sh)
 
+run-test-cpp:
+	@echo "Running cpp unittests..."
+	@echo $(PWD)/scripts/run_cpp_unittest.sh arg=${filter}
+	@(env bash $(PWD)/scripts/run_cpp_unittest.sh arg=${filter})
+
+
 # Run code coverage.
 codecov: codecov-go codecov-cpp
 
diff --git a/scripts/run_cpp_unittest.sh b/scripts/run_cpp_unittest.sh
index 1e94ea865b..636fddcd30 100755
--- a/scripts/run_cpp_unittest.sh
+++ b/scripts/run_cpp_unittest.sh
@@ -36,12 +36,26 @@ if [ -d "${CORE_INSTALL_PREFIX}/lib" ]; then
 fi
 
 # run unittest
+arg="$1"
+filter_value="${arg#*=}"
+
 for UNITTEST_DIR in "${UNITTEST_DIRS[@]}"; do
   if [ ! -d "${UNITTEST_DIR}" ]; then
     echo "The unittest folder does not exist!"
     exit 1
   fi
 
+
+  if [[ $filter_value ]]; then
+    if [ $filter_value == "--gtest_list_tests" ]; then
+	  ${UNITTEST_DIR}/all_tests $filter_value
+	  exit 0
+    else
+	  ${UNITTEST_DIR}/all_tests --gtest_filter=$filter_value
+	  exit 0
+    fi
+  fi
+
   echo "Running all unittest ..."
   ${UNITTEST_DIR}/all_tests
   if [ $? -ne 0 ]; then
@@ -56,6 +70,7 @@ for UNITTEST_DIR in "${UNITTEST_DIRS[@]}"; do
         exit 1
       fi
   fi
+
 done
 
 # run cwrapper unittest