diff --git a/.buckconfig b/.buckconfig
index df5f9c568d610..3a130f57196e3 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -17,7 +17,7 @@
   run_transitive = false
 
 [tools]
-  closure_compiler = third_party/closure/bin/compiler.jar
+  closure_compiler = //third_party/closure:compiler
 
 [alias]
   chrome   = //java/client/src/org/openqa/selenium/chrome:chrome
diff --git a/.buckversion b/.buckversion
index f1495c68a6e82..822261e76d5f8 100644
--- a/.buckversion
+++ b/.buckversion
@@ -1 +1 @@
-e5a668b276bf61b21c83b807a0715c096888d53f
+9ff292b1846b164eefca3ade115ced738fcc4610
diff --git a/java/client/test/org/openqa/selenium/BUCK b/java/client/test/org/openqa/selenium/BUCK
index c5b9015d695bd..ee411811bc5ea 100644
--- a/java/client/test/org/openqa/selenium/BUCK
+++ b/java/client/test/org/openqa/selenium/BUCK
@@ -99,8 +99,10 @@ java_library(name = 'tests',
     '//java/client/test/org/openqa/selenium/testing/drivers:drivers',
     '//third_party/java/guava-libraries:guava-libraries',
     '//third_party/java/hamcrest:hamcrest',
+    '//third_party/java/jetty:jetty',
     '//third_party/java/junit:junit',
     '//third_party/java/mockito:mockito',
+    '//third_party/java/servlet:servlet-api',
     '//third_party/java/webbit:webbit',
   ],
   visibility = [
diff --git a/java/server/src/org/openqa/grid/shared/BUCK b/java/server/src/org/openqa/grid/shared/BUCK
index 90891459ba443..540fa91a5bb5f 100644
--- a/java/server/src/org/openqa/grid/shared/BUCK
+++ b/java/server/src/org/openqa/grid/shared/BUCK
@@ -16,5 +16,6 @@ java_library(name = 'interfaces',
     '//java/server/src/org/openqa/grid/selenium:classes',
     '//java/server/src/org/openqa/selenium/server:server',
     '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
+    '//java/server/test/org/openqa/grid/...'
   ],
 )
diff --git a/java/server/src/org/openqa/selenium/server/BUCK b/java/server/src/org/openqa/selenium/server/BUCK
index 33320960a34d8..ee208a43d9d4c 100644
--- a/java/server/src/org/openqa/selenium/server/BUCK
+++ b/java/server/src/org/openqa/selenium/server/BUCK
@@ -37,6 +37,7 @@ java_library(name = 'server',
     '//java/server/src/org/openqa/grid:grid',
     '//java/server/src/org/openqa/grid/common:common',
     '//java/server/src/org/openqa/grid/selenium:classes',
+    '//java/server/test/org/openqa/grid/...',
   ],
 )
 
diff --git a/java/server/test/org/openqa/grid/e2e/BUCK b/java/server/test/org/openqa/grid/e2e/BUCK
index 6272ea5882286..ef92727fdd499 100644
--- a/java/server/test/org/openqa/grid/e2e/BUCK
+++ b/java/server/test/org/openqa/grid/e2e/BUCK
@@ -12,15 +12,17 @@ java_library(name = 'tests',
   srcs = glob(['**/*.java'], excludes = SUITES),
   deps = [
     '//java/client/src/com/thoughtworks/selenium:selenium',
-    '//java/server/src/org/openqa/grid:grid',
-    '//java/server/src/org/openqa/grid/common:common',
-    '//java/server/src/org/openqa/grid/selenium:classes',
     '//java/client/src/org/openqa/selenium/chrome:chrome',
     '//java/client/src/org/openqa/selenium/htmlunit:htmlunit',
     '//java/client/src/org/openqa/selenium/firefox:firefox',
     '//java/client/src/org/openqa/selenium/net:net',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/src/org/openqa/selenium/support/ui:wait',
+    '//java/server/src/org/openqa/selenium/server:server',
+    '//java/server/src/org/openqa/grid:grid',
+    '//java/server/src/org/openqa/grid/common:common',
+    '//java/server/src/org/openqa/grid/selenium:classes',
+    '//java/server/src/org/openqa/grid/shared:interfaces',
     '//third_party/java/guava-libraries:guava-libraries',
     '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/junit:junit',
diff --git a/javascript/safari-driver/BUCK b/javascript/safari-driver/BUCK
index f432018030baf..8d872268e23ee 100644
--- a/javascript/safari-driver/BUCK
+++ b/javascript/safari-driver/BUCK
@@ -121,6 +121,9 @@ js_binary(
     '--jscomp_error=uselessCode',
     '--jscomp_error=visibility',
 
+    '--language_in=ECMASCRIPT6_STRICT',
+    '--language_out=ECMASCRIPT5_STRICT',
+
     "--output_wrapper='%output%;safaridriver.debug.init();'",
     '--third_party=false',
   ],
@@ -181,6 +184,9 @@ js_binary(
     '--jscomp_error=uselessCode',
     '--jscomp_error=visibility',
 
+    '--language_in=ECMASCRIPT6_STRICT',
+    '--language_out=ECMASCRIPT5_STRICT',
+
     "--output_wrapper='%output%;safaridriver.extension.init();'",
     '--third_party=false',
   ],
diff --git a/third_party/closure/BUCK b/third_party/closure/BUCK
index 5ed06e1b6522f..d51fa2b9d59cd 100644
--- a/third_party/closure/BUCK
+++ b/third_party/closure/BUCK
@@ -2,3 +2,15 @@ js_library(name = 'closure',
   srcs = glob(['**/*.js']),
   visibility = ['PUBLIC'],
 )
+
+prebuilt_jar(name = 'compiler-jar',
+  binary_jar = 'bin/compiler.jar',
+)
+
+java_binary(name = 'compiler',
+  main_class = 'com.google.javascript.jscomp.CommandLineRunner',
+  deps = [
+    ':compiler-jar',
+  ],
+  visibility = ['PUBLIC'],
+)
diff --git a/third_party/java/jetty/BUCK b/third_party/java/jetty/BUCK
index 3838a0a3408b8..554f44bddf755 100644
--- a/third_party/java/jetty/BUCK
+++ b/third_party/java/jetty/BUCK
@@ -14,6 +14,7 @@ java_library(
     ':jetty-security-repacked',
   ],
   visibility = [
+    '//java/client/test/org/openqa/selenium:tests',
     '//java/client/test/org/openqa/selenium/environment:environment',
     '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
     '//java/server/src/org/openqa/grid:grid',
diff --git a/third_party/java/servlet/BUCK b/third_party/java/servlet/BUCK
index 6178f6c55b4c7..729f3a22e5cc1 100644
--- a/third_party/java/servlet/BUCK
+++ b/third_party/java/servlet/BUCK
@@ -2,6 +2,7 @@ prebuilt_jar(name = 'servlet-api',
   binary_jar = 'javax.servlet-api-3.1.0.jar',
   source_jar = 'javax.servlet-api-3.1.0-sources.jar',
   visibility = [
+    '//java/client/test/org/openqa/selenium:tests',
     '//java/client/test/org/openqa/selenium/environment:environment',
 
     # The standalone selenium server