diff --git a/.travis.yml b/.travis.yml
index 6a3aef908..69e66f821 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ node_js:
 env:
   global:
     # Please get your own free key if you want to test yourself
-    - SAUCE_USERNAME=dojo2-ts-ci
-    - SAUCE_ACCESS_KEY=e92610e3-834e-4bec-a3b5-6f7b9d874601
+    - BROWSERSTACK_USERNAME=sitepenlabs1
+    - BROWSERSTACK_ACCESS_KEY=836y5xDYPeFudz5HvZyp
   matrix:
     - INTERN_NODE_ONLY=1
     - INTERN_NODE_ONLY=0
diff --git a/tests/selftest.intern.js b/tests/selftest.intern.js
index aa82294ea..6c98c41a4 100644
--- a/tests/selftest.intern.js
+++ b/tests/selftest.intern.js
@@ -6,16 +6,18 @@ define({
 		'idle-timeout': 60
 	},
 	environments: [
-		{ browserName: 'internet explorer', version: '11.0', platform: 'Windows 10', fixSessionCapabilities: false },
-		{ browserName: 'internet explorer', version: '10.0', platform: 'Windows 8', fixSessionCapabilities: false },
-		{ browserName: 'internet explorer', version: '9.0', platform: 'Windows 7', fixSessionCapabilities: false },
-		{ browserName: 'firefox', version: '33.0', platform: [ 'Windows 7', 'OS X 10.11' ], fixSessionCapabilities: false },
-		{ browserName: 'chrome', version: '38.0', platform: [ 'Windows 7', 'OS X 10.11' ], fixSessionCapabilities: false },
-		{ browserName: 'safari', version: '9.0', platform: 'OS X 10.11', fixSessionCapabilities: false }
+		{ browserName: 'internet explorer', version: '11.0', platform: 'WINDOWS', fixSessionCapabilities: false },
+		{ browserName: 'internet explorer', version: '10.0', platform: 'WIN8', fixSessionCapabilities: false },
+		{ browserName: 'internet explorer', version: '9.0', platform: 'WINDOWS', fixSessionCapabilities: false },
+		{ browserName: 'firefox', version: [ '33', '49' ], platform: [ 'WINDOWS', 'MAC' ],
+			fixSessionCapabilities: false },
+		{ browserName: 'chrome', version: [ '38', '52' ], platform: [ 'WINDOWS', 'MAC' ],
+			fixSessionCapabilities: false },
+		{ browserName: 'safari', version: [ '9', '10' ], fixSessionCapabilities: false }
 	],
 
 	maxConcurrency: 2,
-	tunnel: 'SauceLabsTunnel',
+	tunnel: 'BrowserStackTunnel',
 
 	loaderOptions: {
 		// Packages that should be registered with the loader in each testing environment