diff --git a/WORKSPACE b/WORKSPACE
index 04daf34db..6db5db595 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -7,7 +7,7 @@ domain_registry_repositories()
 git_repository(
     name = "io_bazel_rules_closure",
     remote = "https://github.com/bazelbuild/rules_closure.git",
-    tag = "0.1.0",
+    tag = "0.2.3",
 )
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
@@ -18,4 +18,5 @@ closure_repositories(
     omit_icu4j = True,
     omit_jsr305 = True,
     omit_jsr330_inject = True,
+    omit_protobuf_java = True,
 )
diff --git a/java/google/registry/flows/BUILD b/java/google/registry/flows/BUILD
index 1c67366aa..4ce8e5d2c 100644
--- a/java/google/registry/flows/BUILD
+++ b/java/google/registry/flows/BUILD
@@ -4,7 +4,7 @@ package(
 
 licenses(["notice"])  # Apache 2.0
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_template_java_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_java_template_library")
 
 
 filegroup(
@@ -56,7 +56,7 @@ java_library(
     ],
 )
 
-closure_template_java_library(
+closure_java_template_library(
     name = "soy_java_wrappers",
     srcs = glob(["soy/*.soy"]),
     java_package = "google.registry.flows.soy",
diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl
index 406fc894b..52816f34a 100644
--- a/java/google/registry/repositories.bzl
+++ b/java/google/registry/repositories.bzl
@@ -422,8 +422,8 @@ def domain_registry_repositories():
 
   native.maven_jar(
       name = "protobuf_java",
-      artifact = "com.google.protobuf:protobuf-java:2.6.1",
-      sha1 = "d9521f2aecb909835746b7a5facf612af5e890e8",
+      artifact = "com.google.protobuf:protobuf-java:3.0.0-beta-3",
+      sha1 = "ed8c2f9a63cfa770292f8173fd0172bdaa014fe3",
   )
 
   native.maven_jar(
diff --git a/java/google/registry/tools/soy/BUILD b/java/google/registry/tools/soy/BUILD
index 49a0af03f..46ae4d421 100644
--- a/java/google/registry/tools/soy/BUILD
+++ b/java/google/registry/tools/soy/BUILD
@@ -2,10 +2,10 @@ package(default_visibility = ["//java/google/registry:registry_project"])
 
 licenses(["notice"])  # Apache 2.0
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_template_java_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_java_template_library")
 
 
-closure_template_java_library(
+closure_java_template_library(
     name = "soy_java_wrappers",
     srcs = glob(["*.soy"]),
     java_package = "google.registry.tools.soy",
diff --git a/java/google/registry/ui/soy/BUILD b/java/google/registry/ui/soy/BUILD
index 427537250..670fcff29 100644
--- a/java/google/registry/ui/soy/BUILD
+++ b/java/google/registry/ui/soy/BUILD
@@ -2,7 +2,7 @@ package(default_visibility = ["//java/google/registry:registry_project"])
 
 licenses(["notice"])  # Apache 2.0
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_template_java_library", "closure_template_js_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_java_template_library", "closure_js_template_library")
 
 
 filegroup(
@@ -13,19 +13,19 @@ filegroup(
     ],
 )
 
-closure_template_java_library(
+closure_java_template_library(
     name = "soy_java_wrappers",
     srcs = glob(["*.soy"]),
     java_package = "google.registry.ui.soy",
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "Console",
     srcs = ["Console.soy"],
     globals = "//java/google/registry/ui:globals.txt",
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "Forms",
     srcs = ["Forms.soy"],
     globals = "//java/google/registry/ui:globals.txt",
diff --git a/java/google/registry/ui/soy/registrar/BUILD b/java/google/registry/ui/soy/registrar/BUILD
index 8311b0785..8012d4465 100644
--- a/java/google/registry/ui/soy/registrar/BUILD
+++ b/java/google/registry/ui/soy/registrar/BUILD
@@ -2,7 +2,7 @@ package(default_visibility = ["//java/google/registry:registry_project"])
 
 licenses(["notice"])  # Apache 2.0
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_template_java_library", "closure_template_js_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_java_template_library", "closure_js_template_library")
 
 
 filegroup(
@@ -23,85 +23,85 @@ filegroup(
     ],
 )
 
-closure_template_java_library(
+closure_java_template_library(
     name = "soy_java_wrappers",
     srcs = glob(["*.soy"]),
     java_package = "google.registry.ui.soy.registrar",
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "Console",
     srcs = ["Console.soy"],
     globals = "//java/google/registry/ui:globals.txt",
     deps = ["//java/google/registry/ui/soy:Console"],
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "ContactEpp",
     srcs = ["ContactEpp.soy"],
     globals = "//java/google/registry/ui:globals.txt",
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "ContactSettings",
     srcs = ["ContactSettings.soy"],
     globals = "//java/google/registry/ui:globals.txt",
     deps = ["//java/google/registry/ui/soy:Forms"],
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "Contact",
     srcs = ["Contact.soy"],
     globals = "//java/google/registry/ui:globals.txt",
     deps = ["//java/google/registry/ui/soy:Forms"],
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "Domain",
     srcs = ["Domain.soy"],
     globals = "//java/google/registry/ui:globals.txt",
     deps = ["//java/google/registry/ui/soy:Forms"],
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "DomainEpp",
     srcs = ["DomainEpp.soy"],
     globals = "//java/google/registry/ui:globals.txt",
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "Epp",
     srcs = ["Epp.soy"],
     globals = "//java/google/registry/ui:globals.txt",
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "HostEpp",
     srcs = ["HostEpp.soy"],
     globals = "//java/google/registry/ui:globals.txt",
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "Host",
     srcs = ["Host.soy"],
     globals = "//java/google/registry/ui:globals.txt",
     deps = ["//java/google/registry/ui/soy:Forms"],
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "Payment",
     srcs = ["Payment.soy"],
     globals = "//java/google/registry/ui:globals.txt",
     deps = ["//java/google/registry/ui/soy:Forms"],
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "SecuritySettings",
     srcs = ["SecuritySettings.soy"],
     globals = "//java/google/registry/ui:globals.txt",
 )
 
-closure_template_js_library(
+closure_js_template_library(
     name = "WhoisSettings",
     srcs = ["WhoisSettings.soy"],
     globals = "//java/google/registry/ui:globals.txt",
diff --git a/javatests/google/registry/ui/js/BUILD b/javatests/google/registry/ui/js/BUILD
index 3271c8d15..179d360aa 100644
--- a/javatests/google/registry/ui/js/BUILD
+++ b/javatests/google/registry/ui/js/BUILD
@@ -22,9 +22,11 @@ closure_js_test(
     size = "medium",
     timeout = "short",
     srcs = glob(["*_test.js"]),
+    compilation_level = "WHITESPACE_ONLY",
     deps = [
         ":testing",
         "//javascript/closure",
         "//java/google/registry/ui/js",
+        "//javascript/closure:testing",
     ],
 )
diff --git a/javatests/google/registry/ui/js/registrar/BUILD b/javatests/google/registry/ui/js/registrar/BUILD
index 7cc39fd2f..eff0f72bb 100644
--- a/javatests/google/registry/ui/js/registrar/BUILD
+++ b/javatests/google/registry/ui/js/registrar/BUILD
@@ -24,6 +24,7 @@ closure_js_test(
     size = "medium",
     timeout = "short",
     srcs = glob(["*_test.js"]),
+    compilation_level = "WHITESPACE_ONLY",
     deps = [
         ":console_test_util",
         "//javascript/closure",
@@ -31,5 +32,6 @@ closure_js_test(
         "//java/google/registry/ui/js/registrar",
         "//java/google/registry/ui/soy/registrar:Console",
         "//javatests/google/registry/ui/js:testing",
+        "//javascript/closure:testing",
     ],
 )