diff --git a/src/cmd/gofmt/Makefile b/src/cmd/gofmt/Makefile
index 5f2f454e822..dc5b060e654 100644
--- a/src/cmd/gofmt/Makefile
+++ b/src/cmd/gofmt/Makefile
@@ -15,5 +15,5 @@ include ../../Make.cmd
 test: $(TARG)
 	./test.sh
 
-smoketest: $(TARG)
-	(cd testdata; ./test.sh)
+testshort:
+	gotest -test.short
diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 2e6e092b0bf..e45b39e86a8 100644
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -194,7 +194,6 @@ NOTEST+=\
 	../cmd/cgo\
 	../cmd/ebnflint\
 	../cmd/godoc\
-	../cmd/gofmt\
 	../cmd/gotest\
 	../cmd/govet\
 	../cmd/goyacc\
diff --git a/src/run.bash b/src/run.bash
index 91cd3cc997e..ea98403f73a 100755
--- a/src/run.bash
+++ b/src/run.bash
@@ -50,15 +50,6 @@ fi
 GOMAXPROCS=10 gomake testshort
 ) || exit $?
 
-[ "$GOARCH" == arm ] ||
-(xcd cmd/gofmt
-if $rebuild; then
-	gomake clean;
-	time gomake
-fi
-time gomake smoketest
-) || exit $?
-
 (xcd cmd/ebnflint
 if $rebuild; then
 	gomake clean;