diff --git a/.travis.yml b/.travis.yml
index 23d4ebca5..f220cc223 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ script:
   - (a; sudo python setup.py install );z
   - (a; nosetests tests/web );z
   - (a; nosetests tests/unit );z
-  - (a; cd tests; python -um sitl );z
+  - (a; python -m tests.sitl );z
 git:
   depth: 10
 language: objective-c
diff --git a/appveyor.yml b/appveyor.yml
index cfb39922e..bf793a0bd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,7 @@ build_script:
   - cmd: 'setlocal & python setup.py install & endlocal'
   - cmd: "setlocal & SET PATH=%PYTHON%;c:\\Python27\\Scripts;%PATH% & nosetests tests\\web & endlocal"
   - cmd: "setlocal & SET PATH=%PYTHON%;c:\\Python27\\Scripts;%PATH% & nosetests tests\\unit & endlocal"
-  - cmd: "setlocal & SET PATH=%PYTHON%;c:\\Python27\\Scripts;%PATH% & cd tests & python -um sitl & endlocal"
+  - cmd: "setlocal & SET PATH=%PYTHON%;c:\\Python27\\Scripts;%PATH% & python -m tests.sitl & endlocal"
 clone_depth: 10
 test: 'off'
 branches:
diff --git a/circle.yml b/circle.yml
index 72d066308..e64b23540 100644
--- a/circle.yml
+++ b/circle.yml
@@ -11,7 +11,7 @@ dependencies:
         environment: {}
     - nosetests tests/unit:
         environment: {}
-    - cd tests; python -um sitl:
+    - python -m tests.sitl:
         environment: {}
   pre:
     - pip2 install nose psutil mock:
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb