diff --git a/run_remote_tests.sh b/run_remote_tests.sh
index b8e1992db5..a323b89f77 100755
--- a/run_remote_tests.sh
+++ b/run_remote_tests.sh
@@ -163,8 +163,8 @@ function main() {
   local search_path=$(echo ${autotest_dir}/{client,server}/{tests,site_tests})
   for test_request in $FLAGS_ARGV; do
     test_request=$(remove_quotes "${test_request}")
-    ! finds=$(find ${search_path} -maxdepth 2 -type f -name control\* | \
-      egrep "${test_request}")
+    ! finds=$(find ${search_path} -maxdepth 2 -type f \( -name control.\* -or \
+      -name control \) | egrep -v "~$" | egrep "${test_request}")
     if [[ -z "${finds}" ]]; then
       echo_color "red" ">>> Cannot find match for \"${test_request}\""
       FLAGS_cleanup=${FLAGS_TRUE}