diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index b0eb595..8bb615f 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -3,10 +3,11 @@
   rbe_ubuntu1604:
     test_targets:
     - "//tests/config:debian-jessie-autoconfig_test"
-    - "//tests/config:debian-jessie-bazel-head-autoconfig_test"
+    # TODO(nlopezgi): reenable this test once bazel 0.19.2 is out
+    #- "//tests/config:debian-jessie-bazel-head-autoconfig_test"
     - "//tests/config:debian-jessie-custom-bazel-rc-version-autoconfig_test"
     - "//tests/config:ubuntu-xenial-autoconfig_test"
-    - "//tests/config:ubuntu-xenial-bazel-head-autoconfig_test"
+    #- "//tests/config:ubuntu-xenial-bazel-head-autoconfig_test"
     - "//tests/config:ubuntu-xenial-custom-bazel-rc-version-autoconfig_test"
     - "//tests/config:debian8_clang_autoconfig_test"
     - "//tests/config:external-repo-autoconfig_test"
diff --git a/tests/config/BUILD b/tests/config/BUILD
index 75cff8d..95cfb2f 100644
--- a/tests/config/BUILD
+++ b/tests/config/BUILD
@@ -27,6 +27,12 @@
     "gcc_env",
 )
 
+bazel_latest_release = "0.19.0"
+
+bazel_next_release = "0.19.2"
+
+bazel_next_release_rc = "2"
+
 # Use "rbe-test-" prefix for easy identification of images to remove after the tests.
 toolchain_container(
     name = "rbe-test-jessie-with-pkgs",
@@ -43,6 +49,8 @@
 docker_toolchain_autoconfig(
     name = "debian-jessie-autoconfig",
     base = ":rbe-test-jessie-with-pkgs.tar",
+    # TODO(nlopezgi): remove after bazel 0.19.2 is out
+    bazel_version = bazel_latest_release,
     env = gcc_env(),
     tags = ["manual"],
     test = True,
@@ -60,7 +68,7 @@
 docker_toolchain_autoconfig(
     name = "debian-jessie-custom-bazel-version-autoconfig",
     base = ":rbe-test-jessie-with-pkgs.tar",
-    bazel_version = "0.16.1",
+    bazel_version = bazel_latest_release,
     env = gcc_env(),
     tags = ["manual"],
     test = True,
@@ -70,8 +78,8 @@
 docker_toolchain_autoconfig(
     name = "debian-jessie-custom-bazel-rc-version-autoconfig",
     base = ":rbe-test-jessie-with-pkgs.tar",
-    bazel_rc_version = "1",
-    bazel_version = "0.16.1",
+    bazel_rc_version = bazel_next_release_rc,
+    bazel_version = bazel_next_release,
     env = gcc_env(),
     tags = ["manual"],
     test = True,
@@ -103,6 +111,8 @@
 docker_toolchain_autoconfig(
     name = "ubuntu-xenial-autoconfig",
     base = ":rbe-test-xenial-with-pkgs.tar",
+    # TODO(nlopezgi): remove after bazel 0.19.2 is out
+    bazel_version = bazel_latest_release,
     env = gcc_env(),
     tags = ["manual"],
     test = True,
@@ -111,6 +121,8 @@
 docker_toolchain_autoconfig(
     name = "external-repo-autoconfig",
     base = ":rbe-test-xenial-with-pkgs.tar",
+    # TODO(nlopezgi): remove after bazel 0.19.2 is out
+    bazel_version = bazel_latest_release,
     config_repos = [
         "local_config_sh",
         "local_config_cc",
@@ -133,7 +145,7 @@
 docker_toolchain_autoconfig(
     name = "ubuntu-xenial-custom-bazel-version-autoconfig",
     base = ":rbe-test-xenial-with-pkgs.tar",
-    bazel_version = "0.19.0",
+    bazel_version = bazel_latest_release,
     env = gcc_env(),
     tags = ["manual"],
     test = True,
@@ -143,8 +155,8 @@
 docker_toolchain_autoconfig(
     name = "ubuntu-xenial-custom-bazel-rc-version-autoconfig",
     base = ":rbe-test-xenial-with-pkgs.tar",
-    bazel_rc_version = "1",
-    bazel_version = "0.19.0",
+    bazel_rc_version = bazel_next_release_rc,
+    bazel_version = bazel_next_release,
     env = gcc_env(),
     tags = ["manual"],
     test = True,