diff --git a/WORKSPACE b/WORKSPACE
index c3264a5..abab995 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "0ccc066431ad7e88a5cd9e06000ce677de1116ee",
+    commit = "a88174652e6f853ead5bbc5dacc1030dbb2d50c3",
 )
 
 load(
diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile
index b2508fc..e60e289 100755
--- a/test/docker/gerrit/Dockerfile
+++ b/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:2.16.27-ubuntu16
+FROM gerritcodereview/gerrit:3.0.16-ubuntu18
 
 USER root
 
diff --git a/test/test_events_plugin.sh b/test/test_events_plugin.sh
index 0a2db23..73f7641 100755
--- a/test/test_events_plugin.sh
+++ b/test/test_events_plugin.sh
@@ -23,7 +23,7 @@
 }
 
 get_change_num() { # < gerrit_push_response > changenum
-    local url=$(awk '/New Changes:/ { getline; print $2 }')
+    local url=$(awk '$NF ~ /\[NEW\]/ { print $2 }')
     echo "${url##*\/}" | tr -d -c '[:digit:]'
 }