diff --git a/tests/test_mediaworker.py b/tests/test_mediaworker.py
index 700b9c53a330a01b980a791b63f6152e9faa74bb..6e19b93c0ce12aa190d778c69cdc3f52b80299ae 100755
--- a/tests/test_mediaworker.py
+++ b/tests/test_mediaworker.py
@@ -63,8 +63,9 @@ def check_celerity_connectivity(ip):
 
 all_ok = True
 
+mediaserver_ip = conf.get('NETWORK_IP')
 worker_ip = conf.get('CELERITY_WORKER_IP')
-if worker_ip != '127.0.1.1':
+if worker_ip != '127.0.1.1' and worker_ip != mediaserver_ip:
     if not check_ssh(worker_ip):
         all_ok = False
     else:
@@ -72,5 +73,8 @@ if worker_ip != '127.0.1.1':
             all_ok = False
         if not run_tests(worker_ip):
             all_ok = False
+else:
+    print('Celerity IP not set or running locally, skipping test')
+    sys.exit(2)
 
 sys.exit(int(not all_ok))