diff --git a/Sanity/upstream-scripttests/runtest.sh b/Sanity/upstream-scripttests/runtest.sh
index 12a32cf..f568630 100755
--- a/Sanity/upstream-scripttests/runtest.sh
+++ b/Sanity/upstream-scripttests/runtest.sh
@@ -87,8 +87,7 @@ rlJournalStart
                                                            0 "Preparing sources"
 
         # Disabling tests unstable on testing-farm
-        grep -r "testing-farm" /var/ARTIFACTS/*/plans/all/discover/default-0/tests
-        if [ $? -eq 0 ]; then
+        if grep -r "testing-farm" /var/ARTIFACTS/*/plans/all/discover/default-0/tests || hostname | grep -q "testing-farm"; then
             rlLog "Disabling tests unstable on testing-farm"
             rlLog "Disabled tests Test_opt_set_keycode, Test_set_completion"
             sed -i "/^func Test_opt_set_keycode\(\)/,/^endfunc$/d" BUILD/vim*/src/testdir/test_options.vim