diff --git a/Makefile b/Makefile
index 93ee10e8..e596de74 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,10 @@
 UNAME = $(shell uname)
 PREFIX=github.com/derekparker/delve
 
+ifndef $(RUN)
+	RUN = ".*"
+endif
+
 build:
 	go build github.com/derekparker/delve/cmd/dlv
 ifeq "$(UNAME)" "Darwin"
@@ -26,8 +30,8 @@ ifeq "$(CERT)" ""
 	$(error You must provide a CERT env var)
 endif
 	go test $(PREFIX)/terminal $(PREFIX)/dwarf/frame $(PREFIX)/dwarf/op $(PREFIX)/dwarf/util $(PREFIX)/source $(PREFIX)/dwarf/line
-	cd proc && go test -c $(PREFIX)/proc && codesign -s $(CERT) ./proc.test && ./proc.test $(TESTFLAGS) && rm ./proc.test
-	cd service/rest && go test -c $(PREFIX)/service/rest && codesign -s $(CERT) ./rest.test && ./rest.test $(TESTFLAGS) && rm ./rest.test
+	go test -c $(PREFIX)/proc && codesign -s $(CERT) ./proc.test && ./proc.test $(TESTFLAGS) && rm ./proc.test
+	go test -c $(PREFIX)/service/rest && codesign -s $(CERT) ./rest.test && ./rest.test $(TESTFLAGS) && rm ./rest.test
 else
 	go test -v ./...
 endif
@@ -37,9 +41,9 @@ ifeq "$(UNAME)" "Darwin"
 ifeq "$(CERT)" ""
 	$(error You must provide a CERT env var)
 endif
-	cd proc && go test -c $(PREFIX)/proc && codesign -s $(CERT) ./proc.test && ./proc.test -test.run $(RUN) && rm ./proc.test
+	go test -c $(PREFIX)/proc && codesign -s $(CERT) ./proc.test && ./proc.test -test.run $(RUN) && rm ./proc.test
 else
-	cd proc && go test -run $(RUN)
+	go test $(PREFIX) -run $(RUN)
 endif
 
 test-integration-run:
@@ -47,7 +51,7 @@ ifeq "$(UNAME)" "Darwin"
 ifeq "$(CERT)" ""
 	$(error You must provide a CERT env var)
 endif
-	cd service/rest && go test -c $(PREFIX)/service/rest && codesign -s $(CERT) ./rest.test && ./rest.test -test.run $(RUN) && rm ./rest.test
+	go test -c $(PREFIX)/service/rest && codesign -s $(CERT) ./rest.test && ./rest.test -test.run $(RUN) && rm ./rest.test
 else
-	cd service/rest && go test -run $(RUN)
+	go test $(PREFIX)/service/rest -run $(RUN)
 endif