diff --git a/Makefile b/Makefile
index b58a188..d22dc18 100644
--- a/Makefile
+++ b/Makefile
@@ -34,28 +34,8 @@ install:
 ./bin/minimock:
 	go build ./cmd/minimock -o ./bin/minimock
 
-clean:
-	[ -e ./tests/formatter_mock.go.test_origin ] && mv -f ./tests/formatter_mock.go.test_origin ./tests/formatter_mock.go
-	[ -e ./tests/tester_mock_test.go.test_origin ] && mv -f ./tests/tester_mock_test.go.test_origin ./tests/tester_mock_test.go
-	[ -e ./tests/generic/generic_inout.go.test_origin ] && mv -f ./tests/generic/generic_inout.go.test_origin ./tests/generic/generic_inout.go
-	[ -e ./tests/generic/generic_out.go.test_origin ] && mv -f ./tests/generic/generic_out.go.test_origin ./tests/generic/generic_out.go
-	[ -e ./tests/generic/generic_in.go.test_origin ]&& mv -f ./tests/generic/generic_in.go.test_origin ./tests/generic/generic_in.go
-	rm -Rf bin/ dist/
-
-test_save_origin:
-	[ -e ./tests/formatter_mock.go.test_origin ] || cp ./tests/formatter_mock.go ./tests/formatter_mock.go.test_origin
-	[ -e ./tests/tester_mock_test.go.test_origin ] || cp ./tests/tester_mock_test.go ./tests/tester_mock_test.go.test_origin
-	[ -e ./tests/generic/generic_inout.go.test_origin ] || cp ./tests/generic/generic_inout.go ./tests/generic/generic_inout.go.test_origin
-	[ -e ./tests/generic/generic_out.go.test_origin ] || cp ./tests/generic/generic_out.go ./tests/generic/generic_out.go.test_origin
-	[ -e ./tests/generic/generic_in.go.test_origin ]|| cp ./tests/generic/generic_in.go ./tests/generic/generic_in.go.test_origin
-
-test: test_save_origin generate
-	diff ./tests/formatter_mock.go ./tests/formatter_mock.go.test_origin
-	diff ./tests/tester_mock_test.go ./tests/tester_mock_test.go.test_origin
-	diff ./tests/generic/generic_inout.go ./tests/generic/generic_inout.go.test_origin
-	diff ./tests/generic/generic_out.go ./tests/generic/generic_out.go.test_origin
-	diff ./tests/generic/generic_in.go ./tests/generic/generic_in.go.test_origin
-	go test -race ./...
+test:
+	go test $(go list ./... | grep -v /snapshots)
 
 release: ./bin/goreleaser
 	./bin/goreleaser release
diff --git a/go.mod b/go.mod
index 6c4ffdd..7c01771 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,7 @@
 module github.com/gojuno/minimock/v3
 
 require (
+	github.com/bradleyjkemp/cupaloy v2.3.0+incompatible
 	github.com/davecgh/go-spew v1.1.1
 	github.com/hexdigest/gowrap v1.1.8
 	github.com/pkg/errors v0.9.1
@@ -11,7 +12,6 @@ require (
 )
 
 require (
-	github.com/bradleyjkemp/cupaloy v2.3.0+incompatible // indirect
 	github.com/kr/text v0.2.0 // indirect
 	golang.org/x/mod v0.4.2 // indirect
 	golang.org/x/sys v0.1.0 // indirect