diff --git a/Dockerfile b/Dockerfile
index 997a27b90..6668aa4c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,10 @@
 FROM ethereum/solc:0.5.15 as solc-builder
 # We use a multistage build to avoid bloating our deployment image with build dependencies
 FROM golang:1.16-alpine3.13 as builder
+# We use gofuzz
+FROM gcr.io/oss-fuzz-base/base-builder-go
+
+RUN git clone --depth 1 https://github.com/ianlancetaylor/demangle
 
 RUN apk add --no-cache --update git bash make musl-dev gcc libc6-compat
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 3325b049c..ec90bbb08 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,3 +17,8 @@ services:
     volumes:
     - .:/go/src/github.com/hyperledger/burrow
     working_dir: /go/src/github.com/hyperledger/burrow
+language: go
+fuzz_engines: 
+- libfuzzer
+santinizers: 
+- address  
diff --git a/tests/fuzzer/test_oss_fuzzer.go b/tests/fuzzer/test_oss_fuzzer.go
new file mode 100644
index 000000000..c574457db
--- /dev/null
+++ b/tests/fuzzer/test_oss_fuzzer.go
@@ -0,0 +1,10 @@
+package fuzzer
+
+import (
+	"fmt"
+)
+
+func Fuzz(data []byte) int {
+	fmt.Println(data)
+	return 0
+}