diff --git a/Gruntfile.js b/Gruntfile.js
index b8c5c93a..15567ba1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -76,7 +76,7 @@ module.exports = function(grunt) {
 
         protractor: {
             options: {
-                keepAlive: true,
+                keepAlive: false,
                 configFile: "test/protractor.conf.js"
             },
             singlerun: {},
@@ -84,14 +84,6 @@ module.exports = function(grunt) {
                 options: {
                     args: saucelabsConfig
                 }
-            },
-            auto: {
-                keepAlive: true,
-                options: {
-                    args: {
-                        seleniumPort: 4444
-                    }
-                }
             }
         },
 
@@ -179,11 +171,6 @@ module.exports = function(grunt) {
                 autoWatch: false,
                 singleRun: true
             },
-            unit_auto: {
-                configFile: 'test/karma-unit.conf.js',
-                autoWatch: true,
-                singleRun: false
-            },
             unit_coverage: {
                 configFile: 'test/karma-unit.conf.js',
                 autoWatch: false,
@@ -214,10 +201,6 @@ module.exports = function(grunt) {
                     'test:unit',
                     'concat:license'
                 ]
-            },
-            protractor: {
-                files: ['src/**/*.js','test/e2e/**/*.js'],
-                tasks: ['protractor:auto']
             }
         },
 
@@ -283,11 +266,6 @@ module.exports = function(grunt) {
     grunt.registerTask('test:unit', ['karma:unit']);
     grunt.registerTask('test:e2e', ['shell:protractor_update', 'connect:testserver', 'protractor:singlerun']);
 
-    //autotest and watch tests
-    grunt.registerTask('autotest', ['karma:unit_auto']);
-    grunt.registerTask('autotest:unit', ['karma:unit_auto']);
-    grunt.registerTask('autotest:e2e', ['connect:testserver', 'shell:selenium', 'watch:protractor']);
-
     //coverage testing
     grunt.registerTask('test:coverage', ['karma:unit_coverage']);
     grunt.registerTask('coverage', ['karma:unit_coverage', 'open:coverage', 'connect:coverage']);
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
index 5c5c3565..fdd60d22 100644
--- a/test/protractor.conf.js
+++ b/test/protractor.conf.js
@@ -15,7 +15,7 @@ exports.config = {
   // chromeDriver)
 
   // The location of the selenium standalone server .jar file.
-  seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.37.0.jar',
+  seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.39.0.jar',
   // The port to start the selenium server on, or null if the server should
   // find its own unused port.
   seleniumPort: null,