diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 26c17db..3b81a52 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -319,11 +319,36 @@
       - "//src:all_windows_tests"
   rbe_ubuntu1604:
     shell_commands:
-      - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
-        -e 's/^# android_ndk_repository/android_ndk_repository/'
-        -e 's/^# rbe_autoconfig/rbe_autoconfig/'
-        -e 's/^# load("@bazel_toolchains/load("@bazel_toolchains/' WORKSPACE
-      - rm -f WORKSPACE.bak
-    build_targets:
-      - "//src:bazel"
-      - "//src:bazel_jdk_minimal"
+    - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
+      android_ndk_repository/android_ndk_repository/' WORKSPACE
+    - rm -f WORKSPACE.bak
+    test_flags:
+    - "--config=ubuntu1604_java8"
+    - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
+    - "--jobs=200"
+    - "--experimental_remote_download_outputs=minimal"
+    - "--experimental_inmemory_jdeps_files"
+    - "--experimental_inmemory_dotd_files"
+    test_targets:
+    - "--"
+    - "//scripts/..."
+    - "//src/java_tools/..."
+    - "//src/test/..."
+    - "//src/tools/execlog/..."
+    - "//src/tools/singlejar/..."
+    - "//src/tools/workspacelog/..."
+    - "//third_party/ijar/..."
+    - "//tools/aquery_differ/..."
+    - "//tools/python/..."
+    - "//tools/android/..."
+    # See https://github.com/bazelbuild/bazel/issues/8033
+    - "-//src/tools/singlejar:output_jar_simple_test"
+    - "-//src/test/shell/bazel:external_integration_test"
+    - "-//src/test/shell/bazel:maven_test"
+    - "-//src/test/shell/bazel:bazel_repository_cache_test"
+    - "-//src/test/shell/integration:java_integration_test"
+    - "-//src/test/java/com/google/devtools/build/lib:sandbox-tests"
+    # See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec)
+    - "-//src/java_tools/buildjar/..."
+    - "-//src/java_tools/import_deps_checker/..."
+