diff --git a/.travis.yml b/.travis.yml
index ec59845..e0d02a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,13 @@ sudo: false
 
 language: go
 go:
-  - 1.3.1
+  - 1.6
 
 env:
   global:
     - PATH=$HOME/gopath/bin:$PATH
 
 before_install:
-  - go get code.google.com/p/go.tools/cmd/cover
   - go get github.com/tools/godep
   - godep restore
 
diff --git a/start.go b/start.go
index cc7cde2..b19de75 100644
--- a/start.go
+++ b/start.go
@@ -165,7 +165,9 @@ func (f *Forego) startProcess(idx, procNum int, proc ProcfileEntry, env Env, of
 
 		// Prevent goroutine from exiting before process has finished.
 		defer func() { <-finished }()
-		defer f.teardown.Fall()
+		if !flagRestart {
+			defer f.teardown.Fall()
+		}
 
 		select {
 		case <-finished: