diff --git a/Makefile b/Makefile
index c7a922737..49f38083a 100644
--- a/Makefile
+++ b/Makefile
@@ -35,3 +35,17 @@ downloads/stage3-amd64-current.tar.bz2: get-stage3.sh
 clean:
 	rm -f ocitools runtimetest downloads/*
 	sudo rm -rf rootfs
+
+.PHONY: test .gofmt .govet .golint
+
+test: .gofmt .govet .golint
+
+.gofmt:
+	go fmt ./...
+
+.govet:
+	go vet -x ./...
+
+.golint:
+	golint ./...
+
diff --git a/cmd/runtimetest/main.go b/cmd/runtimetest/main.go
index 48d76358b..f1a1c6043 100644
--- a/cmd/runtimetest/main.go
+++ b/cmd/runtimetest/main.go
@@ -144,7 +144,7 @@ func validateCapabilities(spec *specs.LinuxSpec, rspec *specs.LinuxRuntimeSpec)
 		if expectedSet != actuallySet {
 			if expectedSet {
 				return fmt.Errorf("Expected Capability %v not set for process", cap.String())
-			} 
+			}
 			return fmt.Errorf("Unexpected Capability %v set for process", cap.String())
 		}
 	}