diff --git a/conf/fuzz.go b/conf/fuzz.go
new file mode 100644
index 00000000..08ab826d
--- /dev/null
+++ b/conf/fuzz.go
@@ -0,0 +1,24 @@
+// Copyright 2012-2020 The NATS Authors
+// 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.
+
+// +build gofuzz
+
+package conf
+
+func Fuzz(data []byte) int {
+	_, err := Parse(string(data))
+	if err != nil {
+		return 0
+	}
+	return 1
+}
diff --git a/server/fuzz.go b/server/fuzz.go
new file mode 100644
index 00000000..06e54d2e
--- /dev/null
+++ b/server/fuzz.go
@@ -0,0 +1,34 @@
+// Copyright 2012-2020 The NATS Authors
+// 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.
+
+// +build gofuzz
+
+package server
+
+func Fuzz(data []byte) int {
+	if len(data) < 100 {
+		return -1
+	}
+	c := dummyClient()
+
+	err := c.parse(data[:50])
+	if err != nil {
+		return 0
+	}
+
+	err = c.parse(data[50:])
+	if err != nil {
+		return 0
+	}
+	return 1
+}