diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index da0b2e649..1777752ef 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -66,7 +66,7 @@ if (NOT ${SPIRV_SKIP_TESTS})
     endforeach()
   endif()
 
-  set(SPIRV_ENABLE_EFFCEE ON)
+  option(SPIRV_ENABLE_EFFCEE "Enable effcee-based tests" ON)
   if (MSVC)
     if (MSVC_VERSION LESS 1900)
       message(STATUS "SPIRV-Tools: Need Visual Studio 2015 or later for Effcee and RE2")
diff --git a/kokoro/linux-clang-no-effcee/build.sh b/kokoro/linux-clang-no-effcee/build.sh
new file mode 100644
index 000000000..54ecc46d3
--- /dev/null
+++ b/kokoro/linux-clang-no-effcee/build.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Copyright (c) 2018 Google LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Linux Build Script.
+
+# Fail on any error.
+set -e
+# Display commands being run.
+set -x
+
+SCRIPT_DIR=`dirname "$BASH_SOURCE"`
+source $SCRIPT_DIR/../scripts/linux/build.sh NO_EFFCEE clang
diff --git a/kokoro/linux-clang-no-effcee/continuous.cfg b/kokoro/linux-clang-no-effcee/continuous.cfg
new file mode 100644
index 000000000..13f221ffd
--- /dev/null
+++ b/kokoro/linux-clang-no-effcee/continuous.cfg
@@ -0,0 +1,16 @@
+# Copyright (c) 2018 Google LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Continuous build configuration.
+build_file: "SPIRV-Tools/kokoro/linux-clang-no-effcee/build.sh"
diff --git a/kokoro/linux-clang-no-effcee/presubmit.cfg b/kokoro/linux-clang-no-effcee/presubmit.cfg
new file mode 100644
index 000000000..30c9b83b6
--- /dev/null
+++ b/kokoro/linux-clang-no-effcee/presubmit.cfg
@@ -0,0 +1,16 @@
+# Copyright (c) 2018 Google LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Presubmit build configuration.
+build_file: "SPIRV-Tools/kokoro/linux-clang-no-effcee/build.sh"
diff --git a/kokoro/scripts/linux/build.sh b/kokoro/scripts/linux/build.sh
index d457539d4..599a43fd7 100644
--- a/kokoro/scripts/linux/build.sh
+++ b/kokoro/scripts/linux/build.sh
@@ -60,6 +60,10 @@ elif [ $CONFIG = "RELEASE_MINGW" ]
 then
   ADDITIONAL_CMAKE_FLAGS="-Dgtest_disable_pthreads=ON -DCMAKE_TOOLCHAIN_FILE=$SRC/cmake/linux-mingw-toolchain.cmake"
   SKIP_TESTS="True"
+elif [ $CONFIG = "NO_EFFCEE" ]
+then
+  ADDITIONAL_CMAKE_FLAGS="-DSPIRV_ENABLE_EFFCEE=OFF"
+  BUILD_TYPE="RelWithDebInfo"
 fi
 
 # Get NINJA.