diff --git a/Makefile.fuzz b/Makefile.fuzz
deleted file mode 100644
index 5f4c1be2c..000000000
--- a/Makefile.fuzz
+++ /dev/null
@@ -1,58 +0,0 @@
-# Makefile for fuzzing
-#
-# With https://app.fuzzit.dev/ we are continuously fuzzing CoreDNS.
-#
-# Use go-fuzz and needs the tools installed. For each fuzz.go in a plugin's directory
-# you can start the fuzzing with: make -f Makefile.fuzz <plugin>
-# e.g.
-#
-# 	make -f Makefile.fuzz forward
-#
-# Each plugin that wants to join the fuzzing fray only needs to add a fuzz.go that calls
-# the plugin's ServeDNS and used the plugin/pkg/fuzz for the Do function.
-#
-# Installing go-fuzz is very tricky because it does not support Go modules, see the `Makefile`
-# for the current trickery. The following may do the trick:
-#
-# GO111MODULE=off go get github.com/dvyukov/go-fuzz/go-fuzz-build
-
-REPO:="github.com/coredns/coredns"
-FUZZIT:=v2.4.35
-# set LIBFUZZER=YES to build libfuzzer compatible targets
-
-FUZZ:=$(dir $(wildcard plugin/*/fuzz.go)) # plugin/cache/
-PLUGINS:=$(foreach f,$(FUZZ),$(subst plugin, ,$(f:/=))) # > /cache
-PLUGINS:=$(foreach f,$(PLUGINS),$(subst /, ,$(f))) # > cache
-
-.PHONY: echo
-echo:
-	@echo $(PLUGINS) corefile
-
-all: $(PLUGINS) corefile
-
-.PHONY: $(PLUGINS)
-$(PLUGINS): echo
-ifeq ($(LIBFUZZER), YES)
-	go-fuzz-build -libfuzzer -o $(@).a ./plugin/$(@)
-	clang -fsanitize=fuzzer $(@).a -o $(@)
-else
-	go-fuzz-build $(REPO)/plugin/$(@)
-	go-fuzz -bin=./$(@)-fuzz.zip -workdir=fuzz/$(@)
-endif
-
-.PHONY: corefile
-corefile:
-ifeq ($(LIBFUZZER), YES)
-	go-fuzz-build -libfuzzer -o $(@).a ./test
-	clang -fsanitize=fuzzer $(@).a -o $(@)
-else
-	go-fuzz-build $(REPO)/test
-	go-fuzz -bin=./test-fuzz.zip -workdir=fuzz/$(@)
-endif
-
-fuzzit:
-	wget --quiet -O fuzzit https://github.com/fuzzitdev/fuzzit/releases/download/$(FUZZIT)/fuzzit_Linux_x86_64 && chmod +x fuzzit
-
-.PHONY: clean
-clean:
-	rm *-fuzz.zip
diff --git a/README.md b/README.md
index 4f840f307..837cd925c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,11 @@
 [![CoreDNS](https://coredns.io/images/CoreDNS_Colour_Horizontal.png)](https://coredns.io)
 
 [![Documentation](https://img.shields.io/badge/godoc-reference-blue.svg)](https://godoc.org/github.com/coredns/coredns)
-[![Build Status](https://img.shields.io/travis/coredns/coredns/master.svg?label=build)](https://travis-ci.org/coredns/coredns)
-[![fuzzit](https://app.fuzzit.dev/badge?org_id=coredns&branch=master)](https://fuzzit.dev)
+![CodeQL](https://github.com/coredns/coredns/actions/workflows/codeql-analysis.yml/badge.svg)
+![Go Fmt](https://github.com/coredns/coredns/actions/workflows/go.fmt.yml/badge.svg)
+![Go Tests](https://github.com/coredns/coredns/actions/workflows/go.test.yml/badge.svg)
+![Go Tidy](https://github.com/coredns/coredns/actions/workflows/go.tidy.yml/badge.svg)
+[![CircleCI](https://circleci.com/gh/coredns/coredns.svg?style=shield)](https://circleci.com/gh/coredns/coredns)
 [![Code Coverage](https://img.shields.io/codecov/c/github/coredns/coredns/master.svg)](https://codecov.io/github/coredns/coredns?branch=master)
 [![Docker Pulls](https://img.shields.io/docker/pulls/coredns/coredns.svg)](https://hub.docker.com/r/coredns/coredns)
 [![Go Report Card](https://goreportcard.com/badge/github.com/coredns/coredns)](https://goreportcard.com/report/coredns/coredns)