diff --git a/.travis.yml b/.travis.yml.bak
similarity index 100%
rename from .travis.yml
rename to .travis.yml.bak
diff --git a/appveyor.yml b/appveyor.yml
index d44a24ea..b34e6f74 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,17 @@ install:
 
   - cmd: netsh advfirewall set allprofiles state off
 
-  - ps: Start-Process python -ArgumentList 'test\mqttsas2.py', 'mqtt.iotree.co.uk'
+  - ps: Start-Process python -ArgumentList 'test\mqttsas2.py'
+
+  - cmd: python3 --version
+
+  - cmd: git clone git@github.com:eclipse/paho.mqtt.testing.git
+
+  - cmd: cd paho.mqtt.testing\interoperability
+
+  - ps: Start-Process python3 -ArgumentList 'startbroker.py'
+
+  - cmd: cd ..
 
 build_script:
 - cmd: >-
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3aca80f0..322e93d2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,14 +1,11 @@
 PROJECT(mqtt-tests C)
 
+SET(MQTT_TEST_BROKER "tcp://localhost:1883" CACHE STRING "Hostname of a test MQTT broker to use")
+SET(MQTT_TEST_PROXY "tcp://localhost:1884" CACHE STRING "Hostname of the test proxy to use")
+SET(MQTT_SSL_HOSTNAME "localhost" CACHE STRING "Hostname of a test SSL MQTT broker to use")
 IF (WIN32)
-  SET(MQTT_TEST_BROKER "tcp://mqtt.iotree.co.uk:1883" CACHE STRING "Hostname of a test MQTT broker to use")
-  SET(MQTT_TEST_PROXY "tcp://localhost:1883" CACHE STRING "Hostname of the test proxy to use")
-  SET(MQTT_SSL_HOSTNAME "mqtt.iotree.co.uk" CACHE STRING "Hostname of a test SSL MQTT broker to use")
   SET(CERTDIR $ENV{APPVEYOR_BUILD_FOLDER}/test/ssl)
 ELSE ()
-  SET(MQTT_TEST_BROKER "tcp://localhost:1883" CACHE STRING "Hostname of a test MQTT broker to use")
-  SET(MQTT_TEST_PROXY "tcp://localhost:1884" CACHE STRING "Hostname of the test proxy to use")
-  SET(MQTT_SSL_HOSTNAME "localhost" CACHE STRING "Hostname of a test SSL MQTT broker to use")
   SET(CERTDIR $ENV{TRAVIS_BUILD_DIR}/test/ssl)
 ENDIF ()