diff --git a/Rotefile b/Rotefile
index b52846c..0cbef5d 100644
--- a/Rotefile
+++ b/Rotefile
@@ -94,7 +94,8 @@ task ("test-functional-js", function ()
 
     exec("docker-compose", "up", "-d")
 --    exec("docker-compose", "run", "webapp", "nightwatch", "-e", "firefox")
-    exec("docker-compose", "exec", "webapp", "nightwatch", "-e", "firefox")
+--    exec("docker-compose", "exec", "webapp", "nightwatch", "-e", "firefox")
+    exec("docker-compose", "exec", "webapp", "nightwatch")
 end)
 
 desc("Demos Rookeries in a browser")
diff --git a/circle.yml b/circle.yml
index 98dfa4e..249d573 100644
--- a/circle.yml
+++ b/circle.yml
@@ -40,7 +40,8 @@ test:
     # Wait for tunnel to be ready
     - while [ ! -e .saucelabs/sauce_is_ready ]; do sleep 1; done
 # TODO: Enable web tests when browser issues resolved
-    - ./rote -B -v test-functional
+#    - ./rote -B -v test-functional
+    - ./rote -B -v test-functional-js
 
   post:
       - killall --wait sc  # wait for Sauce Connect to close the tunnel
diff --git a/webapp/nightwatch.json b/webapp/nightwatch.json
index 34d392c..990b83f 100644
--- a/webapp/nightwatch.json
+++ b/webapp/nightwatch.json
@@ -18,28 +18,48 @@
     }
   },
 
-  "test_settings": {
-    "default": {
-      "launch_url": "http://localhost",
-      "selenium_host": "http://localhost",
-      "selenium_port": 6666,
+  "test_settings" : {
+    "default" : {
+      "launch_url" : "http://localhost",
+      "selenium_port"  : 80,
+      "selenium_host"  : "ondemand.saucelabs.com",
       "silent": true,
-      "disable_colors": true,
-      "screenshots": {
-        "enabled": false,
-        "path": ""
+      "screenshots" : {
+        "enabled" : false,
+        "path" : ""
       },
+      "username" : "${SAUCE_USERNAME}",
+      "access_key" : "${SAUCE_ACCESS_KEY}",
+
       "desiredCapabilities": {
-        "browserName": "phantomjs",
-        "phantomjs.cli.args": [
-          "--ignore-ssl-errors=true"
-        ],
-        "phantomjs.page.settings.userAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36",
-        "phantomjs.binary.path": "/usr/local/bin/phantomjs",
         "javascriptEnabled": true,
         "acceptSslCerts": true
       }
-    }
-  }
+    },
 
+    "chrome": {
+      "desiredCapabilities": {
+        "platform": "Windows XP",
+        "browserName": "chrome",
+        "version": "41"
+      }
+    },
+
+    "firefox" : {
+      "desiredCapabilities": {
+        "platform": "Windows XP",
+        "browserName": "firefox",
+        "version": "33"
+      }
+    },
+
+    "internet_explorer_10" : {
+      "desiredCapabilities": {
+        "platform": "Windows 7",
+        "browserName": "internet explorer",
+        "version": "10"
+      }
+    }
+
+  }
 }