diff --git a/projects/fuzzing-puzzles/Dockerfile b/projects/fuzzing-puzzles/Dockerfile
new file mode 100644
index 000000000..25031ff47
--- /dev/null
+++ b/projects/fuzzing-puzzles/Dockerfile
@@ -0,0 +1,24 @@
+# Copyright 2018 Google Inc.
+#
+# 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.
+#
+################################################################################
+
+FROM gcr.io/oss-fuzz-base/base-builder
+MAINTAINER mmoroz@chromium.org
+RUN apt-get update && apt-get install -y make autoconf automake libtool
+ADD https://raw.githubusercontent.com/llvm-mirror/compiler-rt/master/test/fuzzer/MultipleConstraintsOnSmallInputTest.cpp \
+    $SRC/fuzzing-puzzles/
+WORKDIR fuzzing-puzzles
+COPY build.sh $SRC/
+
diff --git a/projects/fuzzing-puzzles/build.sh b/projects/fuzzing-puzzles/build.sh
new file mode 100755
index 000000000..b3968d44c
--- /dev/null
+++ b/projects/fuzzing-puzzles/build.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -eu
+# Copyright 2018 Google Inc.
+#
+# 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.
+#
+################################################################################
+
+$CXX $CXXFLAGS $SRC/fuzzing-puzzles/MultipleConstraintsOnSmallInputTest.cpp \
+    -o $OUT/multiple_constraints_on_small_input_fuzzer \
+    -lFuzzingEngine
diff --git a/projects/fuzzing-puzzles/project.yaml b/projects/fuzzing-puzzles/project.yaml
new file mode 100644
index 000000000..1e4352474
--- /dev/null
+++ b/projects/fuzzing-puzzles/project.yaml
@@ -0,0 +1,13 @@
+homepage: https://github.com/google/fuzzer-test-suite
+primary_contact: kcc@google.com
+auto_ccs:
+  - "kevinwkt@google.com"
+  - "kodewilliams@google.com"
+  - "metzman@google.com"
+  - "mmoroz@google.com"
+
+sanitizers:
+  - undefined
+
+fuzzing_engines:
+  - libfuzzer