diff --git a/cmd/dep/ensure_test.go b/cmd/dep/ensure_test.go
index 88311139df..1f1ae43b19 100644
--- a/cmd/dep/ensure_test.go
+++ b/cmd/dep/ensure_test.go
@@ -5,100 +5,13 @@
 package main
 
 import (
+	"path/filepath"
 	"testing"
 
 	"github.com/golang/dep/test"
 	"github.com/sdboyer/gps"
 )
 
-func TestEnsureOverrides(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("src")
-	h.Setenv("GOPATH", h.Path("."))
-
-	h.TempCopy("src/thing/thing.go", "ensure/overrides_main.go")
-	h.Cd(h.Path("src/thing"))
-
-	h.Run("init")
-	h.Run("ensure", "-override", "github.com/carolynvs/go-dep-test@0.1.1")
-
-	goldenManifest := "ensure/overrides_manifest.golden.json"
-	wantManifest := h.GetTestFileString(goldenManifest)
-	gotManifest := h.ReadManifest()
-	if gotManifest != wantManifest {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenManifest, string(gotManifest)); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Fatalf("expected %s, got %s", wantManifest, gotManifest)
-		}
-	}
-
-	goldenLock := "ensure/overrides_lock.golden.json"
-	wantLock := h.GetTestFileString(goldenLock)
-	gotLock := h.ReadLock()
-	if gotLock != wantLock {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenLock, string(gotLock)); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Fatalf("expected %s, got %s", wantLock, gotLock)
-		}
-	}
-}
-
-func TestEnsureEmptyRepoNoArgs(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("src")
-	h.Setenv("GOPATH", h.Path("."))
-	h.TempCopy("src/thing/thing.go", "ensure/bare_main.go")
-	h.Cd(h.Path("src/thing"))
-
-	h.Run("init")
-	h.Run("ensure")
-
-	// make sure vendor exists
-	h.MustExist(h.Path("src/thing/vendor/github.com/jimmysmith95/fixed-version"))
-
-	goldenManifest := "ensure/bare_manifest.golden.json"
-	wantManifest := h.GetTestFileString(goldenManifest)
-	gotManifest := h.ReadManifest()
-	if gotManifest != wantManifest {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenManifest, string(gotManifest)); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Fatalf("expected %s, got %s", wantManifest, gotManifest)
-		}
-	}
-
-	goldenLock := "ensure/bare_lock.golden.json"
-	wantLock := h.GetTestFileString(goldenLock)
-	gotLock := h.ReadLock()
-	if gotLock != wantLock {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenLock, string(gotLock)); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Fatalf("expected %s, got %s", wantLock, gotLock)
-		}
-	}
-}
-
 func TestDeduceConstraint(t *testing.T) {
 	sv, err := gps.NewSemverConstraint("v1.2.3")
 	if err != nil {
@@ -126,43 +39,108 @@ func TestDeduceConstraint(t *testing.T) {
 	}
 }
 
-func TestEnsureUpdate(t *testing.T) {
+type ensureTestCase struct {
+	dataRoot       string
+	commands       [][]string
+	sourceFiles    map[string]string
+	goldenManifest string
+	goldenLock     string
+}
+
+func TestEnsureCases(t *testing.T) {
+	tests := []ensureTestCase{
+
+		// Override test case
+		{
+			dataRoot: "ensure/override",
+			commands: [][]string{
+				{"init"},
+				{"ensure", "-override", "github.com/sdboyer/deptest@1.0.0"},
+			},
+			sourceFiles: map[string]string{
+				"main.go": "thing.go",
+			},
+			goldenManifest: "manifest.golden.json",
+			goldenLock:     "lock.golden.json",
+		},
+
+		// Empty repo test case
+		{
+			dataRoot: "ensure/empty",
+			commands: [][]string{
+				{"init"},
+				{"ensure"},
+			},
+			sourceFiles: map[string]string{
+				"main.go": "thing.go",
+			},
+			goldenManifest: "manifest.golden.json",
+			goldenLock:     "lock.golden.json",
+		},
+
+		// Update test case
+		{
+			dataRoot: "ensure/update",
+			commands: [][]string{
+				{"ensure", "-update", "github.com/sdboyer/deptest"},
+			},
+			sourceFiles: map[string]string{
+				"main.go":       "thing.go",
+				"manifest.json": "manifest.json",
+				"lock.json":     "lock.json",
+			},
+			goldenManifest: "manifest.json",
+			goldenLock:     "lock.golden.json",
+		},
+	}
+
 	test.NeedsExternalNetwork(t)
 	test.NeedsGit(t)
 
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	// Setup up a test project
-	h.TempDir("src")
-	h.Setenv("GOPATH", h.Path("."))
-	h.TempCopy("src/thing/main.go", "ensure/update_main.go")
-	origManifest := "ensure/update_manifest.json"
-	h.TempCopy("src/thing/manifest.json", origManifest)
-	origLock := "ensure/update_lock.json"
-	h.TempCopy("src/thing/lock.json", origLock)
-	h.Cd(h.Path("src/thing"))
-
-	h.Run("ensure", "-update", "github.com/carolynvs/go-dep-test")
-
-	// Verify that the manifest wasn't modified by -update
-	wantManifest := h.GetTestFileString(origManifest)
-	gotManifest := h.ReadManifest()
-	if gotManifest != wantManifest {
-		t.Fatalf("The manifest should not be modified during an update. Expected %s, got %s", origManifest, gotManifest)
-	}
+	for _, testCase := range tests {
+		t.Run(testCase.dataRoot, func(t *testing.T) {
+			h := test.NewHelper(t)
+			defer h.Cleanup()
 
-	// Verify the lock matches the expected golden file
-	goldenLock := "ensure/update_lock.golden.json"
-	wantLock := h.GetTestFileString(goldenLock)
-	gotLock := h.ReadLock()
-	if gotLock != wantLock {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenLock, string(gotLock)); err != nil {
-				t.Fatal(err)
+			h.TempDir("src")
+			h.Setenv("GOPATH", h.Path("."))
+
+			// Build a fake consumer of these packages.
+			root := "src/thing"
+			for src, dest := range testCase.sourceFiles {
+				h.TempCopy(filepath.Join(root, dest), filepath.Join(testCase.dataRoot, src))
 			}
-		} else {
-			t.Fatalf("expected %s, got %s", wantLock, gotLock)
-		}
+			h.Cd(h.Path(root))
+
+			for _, cmd := range testCase.commands {
+				h.Run(cmd...)
+			}
+
+			wantPath := filepath.Join(testCase.dataRoot, testCase.goldenManifest)
+			wantManifest := h.GetTestFileString(wantPath)
+			gotManifest := h.ReadManifest()
+			if wantManifest != gotManifest {
+				if *test.UpdateGolden {
+					if err := h.WriteTestFile(wantPath, gotManifest); err != nil {
+						t.Fatal(err)
+					}
+				} else {
+					t.Errorf("expected %s, got %s", wantManifest, gotManifest)
+				}
+			}
+
+			wantPath = filepath.Join(testCase.dataRoot, testCase.goldenLock)
+			wantLock := h.GetTestFileString(wantPath)
+			gotLock := h.ReadLock()
+			if wantLock != gotLock {
+				if *test.UpdateGolden {
+					if err := h.WriteTestFile(wantPath, gotLock); err != nil {
+						t.Fatal(err)
+					}
+				} else {
+					t.Errorf("expected %s, got %s", wantLock, gotLock)
+				}
+			}
+		})
 	}
 }
diff --git a/cmd/dep/init_test.go b/cmd/dep/init_test.go
index 025f961f78..a3596b80fa 100644
--- a/cmd/dep/init_test.go
+++ b/cmd/dep/init_test.go
@@ -5,7 +5,7 @@
 package main
 
 import (
-	"strings"
+	"path/filepath"
 	"testing"
 
 	"github.com/golang/dep/test"
@@ -39,63 +39,119 @@ func TestIsStdLib(t *testing.T) {
 	}
 }
 
+type initTestCase struct {
+	dataRoot       string
+	importPaths    map[string]string
+	sourceFiles    map[string]string
+	goldenManifest string
+	goldenLock     string
+	vendorPaths    []string
+}
+
 func TestInit(t *testing.T) {
+	tests := []initTestCase{
+
+		// Both dependencies previously retrieved.  Both will show up in manifest and lock
+		{
+			dataRoot: "init/case1",
+			importPaths: map[string]string{
+				"github.com/sdboyer/deptest":    "v0.8.0",                                   // semver
+				"github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea", // random sha
+			},
+			sourceFiles: map[string]string{
+				"thing.input.go": "foo/thing.go",
+				"bar.input.go":   "foo/bar/bar.go",
+			},
+			goldenManifest: "manifest.golden.json",
+			goldenLock:     "lock.golden.json",
+		},
+
+		// One dependency previously retrieved by version.  Both will show up in lock, but only retrieved one in manifest?
+		{
+			dataRoot: "init/case2",
+			importPaths: map[string]string{
+				"github.com/sdboyer/deptest": "v0.8.0", // semver
+			},
+			sourceFiles: map[string]string{
+				"thing.input.go": "foo/thing.go",
+				"bar.input.go":   "foo/bar/bar.go",
+			},
+			goldenManifest: "manifest.golden.json",
+			goldenLock:     "lock.golden.json",
+		},
+
+		// One dependency previously retrieved by sha.  Both will show up in lock and manifest
+		{
+			dataRoot: "init/case3",
+			importPaths: map[string]string{
+				"github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea",
+			},
+			sourceFiles: map[string]string{
+				"thing.input.go": "foo/thing.go",
+				"bar.input.go":   "foo/bar/bar.go",
+			},
+			goldenManifest: "manifest.golden.json",
+			goldenLock:     "lock.golden.json",
+		},
+	}
+
 	test.NeedsExternalNetwork(t)
 	test.NeedsGit(t)
 
-	h := test.NewHelper(t)
-	defer h.Cleanup()
+	for _, testCase := range tests {
+		t.Run(testCase.dataRoot, func(t *testing.T) {
+			h := test.NewHelper(t)
+			defer h.Cleanup()
 
-	h.TempDir("src")
-	h.Setenv("GOPATH", h.Path("."))
+			h.TempDir("src")
+			h.Setenv("GOPATH", h.Path("."))
 
-	importPaths := map[string]string{
-		"github.com/pkg/errors":      "v0.8.0",                                   // semver
-		"github.com/Sirupsen/logrus": "42b84f9ec624953ecbf81a94feccb3f5935c5edf", // random sha
-	}
+			// checkout the specified revisions
+			for ip, rev := range testCase.importPaths {
+				h.RunGo("get", ip)
+				repoDir := h.Path(filepath.Join("src", ip))
+				h.RunGit(repoDir, "checkout", rev)
+			}
 
-	// checkout the specified revisions
-	for ip, rev := range importPaths {
-		h.RunGo("get", ip)
-		repoDir := h.Path("src/" + ip)
-		h.RunGit(repoDir, "checkout", rev)
-	}
+			// Build a fake consumer of these packages.
+			root := "src/github.com/golang/notexist"
+			for src, dest := range testCase.sourceFiles {
+				h.TempCopy(filepath.Join(root, dest), filepath.Join(testCase.dataRoot, src))
+			}
 
-	// Build a fake consumer of these packages.
-	root := "src/github.com/golang/notexist"
-	h.TempCopy(root+"/foo/thing.go", "init/thing.input.go")
-	h.TempCopy(root+"/foo/bar/bar.go", "init/bar.input.go")
-
-	h.Cd(h.Path(root))
-	h.Run("init")
-
-	goldenManifest := "init/manifest.golden.json"
-	wantManifest := h.GetTestFileString(goldenManifest)
-	gotManifest := h.ReadManifest()
-	if wantManifest != gotManifest {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenManifest, gotManifest); err != nil {
-				t.Fatal(err)
+			h.Cd(h.Path(root))
+			h.Run("init")
+
+			wantPath := filepath.Join(testCase.dataRoot, testCase.goldenManifest)
+			wantManifest := h.GetTestFileString(wantPath)
+			gotManifest := h.ReadManifest()
+			if wantManifest != gotManifest {
+				if *test.UpdateGolden {
+					if err := h.WriteTestFile(wantPath, gotManifest); err != nil {
+						t.Fatal(err)
+					}
+				} else {
+					t.Errorf("expected %s, got %s", wantManifest, gotManifest)
+				}
 			}
-		} else {
-			t.Errorf("expected %s, got %s", wantManifest, gotManifest)
-		}
-	}
 
-	sysCommit := h.GetCommit("go.googlesource.com/sys")
-	goldenLock := "init/lock.golden.json"
-	wantLock := strings.Replace(h.GetTestFileString(goldenLock), "{{sysCommit}}", sysCommit, 1)
-	gotLock := h.ReadLock()
-	if wantLock != gotLock {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenLock, strings.Replace(gotLock, sysCommit, "{{sysCommit}}", 1)); err != nil {
-				t.Fatal(err)
+			wantPath = filepath.Join(testCase.dataRoot, testCase.goldenLock)
+			wantLock := h.GetTestFileString(wantPath)
+			gotLock := h.ReadLock()
+			if wantLock != gotLock {
+				if *test.UpdateGolden {
+					if err := h.WriteTestFile(wantPath, gotLock); err != nil {
+						t.Fatal(err)
+					}
+				} else {
+					t.Errorf("expected %s, got %s", wantLock, gotLock)
+				}
 			}
-		} else {
-			t.Errorf("expected %s, got %s", wantLock, gotLock)
-		}
-	}
 
-	// vendor should have been created & populated
-	h.MustExist(h.Path(root + "/vendor/github.com/Sirupsen/logrus"))
+			// vendor should have been created & populated
+			for ip := range testCase.importPaths {
+				h.MustExist(h.Path(filepath.Join(root, "vendor", ip)))
+			}
+		})
+	}
 }
diff --git a/cmd/dep/remove_test.go b/cmd/dep/remove_test.go
index 3b955727b3..7430933f1e 100644
--- a/cmd/dep/remove_test.go
+++ b/cmd/dep/remove_test.go
@@ -5,69 +5,148 @@
 package main
 
 import (
-	"strings"
+	"path/filepath"
 	"testing"
 
 	"github.com/golang/dep/test"
 )
 
+type removeTestCase struct {
+	dataRoot       string
+	command        []string
+	importPaths    map[string]string
+	sourceFiles    map[string]string
+	goldenManifest string
+	goldenLock     string
+	vendorPaths    []string
+}
+
 func TestRemove(t *testing.T) {
+	tests := []removeTestCase{
+		{
+			dataRoot: "remove/case0",
+			command:  []string{"remove", "-unused"},
+			importPaths: map[string]string{
+				"github.com/sdboyer/deptest":    "v0.8.0",                                   // semver
+				"github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea", // random sha
+			},
+			sourceFiles: map[string]string{
+				"main.go":             "main.go",
+				"manifest.input.json": "manifest.json",
+			},
+			goldenManifest: "manifest.golden.json",
+			goldenLock:     "",
+		},
+		{
+			dataRoot: "remove/case1",
+			command:  []string{"remove", "github.com/not/used"},
+			importPaths: map[string]string{
+				"github.com/sdboyer/deptest":    "v0.8.0",                                   // semver
+				"github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea", // random sha
+			},
+			sourceFiles: map[string]string{
+				"main.go":             "main.go",
+				"manifest.input.json": "manifest.json",
+			},
+			goldenManifest: "manifest.golden.json",
+			goldenLock:     "",
+		},
+		{
+			dataRoot: "remove/case2",
+			command:  []string{"remove", "-force", "github.com/sdboyer/deptestdos", "github.com/not/used"},
+			importPaths: map[string]string{
+				"github.com/sdboyer/deptest":    "v0.8.0",                                   // semver
+				"github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea", // random sha
+			},
+			sourceFiles: map[string]string{
+				"main.go":             "main.go",
+				"manifest.input.json": "manifest.json",
+			},
+			goldenManifest: "manifest.golden.json",
+			goldenLock:     "lock.golden.json",
+		},
+	}
+
 	test.NeedsExternalNetwork(t)
 	test.NeedsGit(t)
 
-	h := test.NewHelper(t)
-	defer h.Cleanup()
+	for _, testCase := range tests {
+		t.Run(testCase.dataRoot, func(t *testing.T) {
+			h := test.NewHelper(t)
+			defer h.Cleanup()
 
-	h.TempDir("src")
-	h.Setenv("GOPATH", h.Path("."))
+			h.TempDir("src")
+			h.Setenv("GOPATH", h.Path("."))
 
-	importPaths := map[string]string{
-		"github.com/pkg/errors":      "v0.8.0",                                   // semver
-		"github.com/Sirupsen/logrus": "42b84f9ec624953ecbf81a94feccb3f5935c5edf", // random sha
-	}
+			// checkout the specified revisions
+			for ip, rev := range testCase.importPaths {
+				h.RunGo("get", ip)
+				repoDir := h.Path(filepath.Join("src", ip))
+				h.RunGit(repoDir, "checkout", rev)
+			}
 
-	// checkout the specified revisions
-	for ip, rev := range importPaths {
-		h.RunGo("get", ip)
-		repoDir := h.Path("src/" + ip)
-		h.RunGit(repoDir, "checkout", rev)
-	}
+			// Build a fake consumer of these packages.
+			root := "src/github.com/golang/notexist"
+			for src, dest := range testCase.sourceFiles {
+				h.TempCopy(filepath.Join(root, dest), filepath.Join(testCase.dataRoot, src))
+			}
 
-	// Build a fake consumer of these packages.
-	const root = "src/github.com/golang/notexist"
-	h.TempCopy(root+"/thing.go", "remove/main.input.go")
-	h.TempCopy(root+"/manifest.json", "remove/manifest.input.json")
+			h.Cd(h.Path(root))
+			h.Run(testCase.command...)
+
+			wantPath := filepath.Join(testCase.dataRoot, testCase.goldenManifest)
+			wantManifest := h.GetTestFileString(wantPath)
+			gotManifest := h.ReadManifest()
+			if wantManifest != gotManifest {
+				if *test.UpdateGolden {
+					if err := h.WriteTestFile(wantPath, gotManifest); err != nil {
+						t.Fatal(err)
+					}
+				} else {
+					t.Errorf("expected %s, got %s", wantManifest, gotManifest)
+				}
+			}
 
-	h.Cd(h.Path(root))
-	h.Run("remove", "-unused")
-
-	goldenManifest := "remove/manifest0.golden.json"
-	wantManifest := h.GetTestFileString(goldenManifest)
-	gotManifest := h.ReadManifest()
-	if wantManifest != gotManifest {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenManifest, gotManifest); err != nil {
-				t.Fatal(err)
+			if testCase.goldenLock != "" {
+				wantPath = filepath.Join(testCase.dataRoot, testCase.goldenLock)
+				wantLock := h.GetTestFileString(wantPath)
+				gotLock := h.ReadLock()
+				if wantLock != gotLock {
+					if *test.UpdateGolden {
+						if err := h.WriteTestFile(wantPath, gotLock); err != nil {
+							t.Fatal(err)
+						}
+					} else {
+						t.Errorf("expected %s, got %s", wantLock, gotLock)
+					}
+				}
 			}
-		} else {
-			t.Errorf("expected %s, got %s", wantManifest, gotManifest)
-		}
+		})
 	}
+}
+
+func TestRemoveErrors(t *testing.T) {
+	test.NeedsExternalNetwork(t)
+	test.NeedsGit(t)
 
-	h.TempCopy(root+"/manifest.json", "remove/manifest.input.json")
-	h.Run("remove", "github.com/not/used")
+	h := test.NewHelper(t)
+	defer h.Cleanup()
 
-	gotManifest = h.ReadManifest()
-	if wantManifest != gotManifest {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenManifest, gotManifest); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Errorf("expected %s, got %s", wantManifest, gotManifest)
-		}
+	h.TempDir("src")
+	h.Setenv("GOPATH", h.Path("."))
+
+	// Build a fake consumer of these packages.
+	sourceFiles := map[string]string{
+		"main.go":             "main.go",
+		"manifest.input.json": "manifest.json",
+	}
+	root := "src/github.com/golang/notexist"
+	for src, dest := range sourceFiles {
+		h.TempCopy(filepath.Join(root, dest), filepath.Join("remove/case0", src))
 	}
 
+	h.Cd(h.Path(root))
+
 	if err := h.DoRun([]string{"remove", "-unused", "github.com/not/used"}); err == nil {
 		t.Fatal("rm with both -unused and arg should have failed")
 	}
@@ -80,37 +159,7 @@ func TestRemove(t *testing.T) {
 		t.Fatal("rm with one arg not in manifest should have failed")
 	}
 
-	if err := h.DoRun([]string{"remove", "github.com/pkg/errors"}); err == nil {
+	if err := h.DoRun([]string{"remove", "github.com/sdboyer/deptest"}); err == nil {
 		t.Fatal("rm of arg in manifest and imports should have failed without -force")
 	}
-
-	h.TempCopy(root+"/manifest.json", "remove/manifest.input.json")
-	h.Run("remove", "-force", "github.com/pkg/errors", "github.com/not/used")
-
-	goldenManifest = "remove/manifest1.golden.json"
-	wantManifest = h.GetTestFileString(goldenManifest)
-	gotManifest = h.ReadManifest()
-	if wantManifest != gotManifest {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenManifest, gotManifest); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Errorf("expected %s, got %s", wantManifest, gotManifest)
-		}
-	}
-
-	sysCommit := h.GetCommit("go.googlesource.com/sys")
-	goldenLock := "remove/lock1.golden.json"
-	wantLock := strings.Replace(h.GetTestFileString(goldenLock), "{{sysCommit}}", sysCommit, 1)
-	gotLock := h.ReadLock()
-	if wantLock != gotLock {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenLock, strings.Replace(gotLock, sysCommit, "{{sysCommit}}", 1)); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Errorf("expected %s, got %s", wantLock, gotLock)
-		}
-	}
 }
diff --git a/cmd/dep/testdata/ensure/bare_lock.golden.json b/cmd/dep/testdata/ensure/bare_lock.golden.json
deleted file mode 100644
index 1ad18c9967..0000000000
--- a/cmd/dep/testdata/ensure/bare_lock.golden.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "memo": "671164a61abeac1133d1da7f6bb22ed18e6921dfc5f9247b378833833b5a3aca",
-    "projects": [
-        {
-            "name": "github.com/jimmysmith95/fixed-version",
-            "version": "v1.0.0",
-            "revision": "a2d649e0636403a4693cd928f60c56ba7d9cd299",
-            "packages": [
-                "."
-            ]
-        }
-    ]
-}
diff --git a/cmd/dep/testdata/ensure/empty/lock.golden.json b/cmd/dep/testdata/ensure/empty/lock.golden.json
new file mode 100644
index 0000000000..bab94e010b
--- /dev/null
+++ b/cmd/dep/testdata/ensure/empty/lock.golden.json
@@ -0,0 +1,13 @@
+{
+    "memo": "63510efb9632ec69c1164ce396d7ebea4ad3884b4fa508373da17226d5a39739",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/deptest",
+            "version": "v1.0.0",
+            "revision": "ff2948a2ac8f538c4ecd55962e919d1e13e74baf",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}
diff --git a/cmd/dep/testdata/ensure/bare_main.go b/cmd/dep/testdata/ensure/empty/main.go
similarity index 82%
rename from cmd/dep/testdata/ensure/bare_main.go
rename to cmd/dep/testdata/ensure/empty/main.go
index 4c6b76c019..1fe0d19d6a 100644
--- a/cmd/dep/testdata/ensure/bare_main.go
+++ b/cmd/dep/testdata/ensure/empty/main.go
@@ -5,7 +5,7 @@
 package main
 
 import (
-	_ "github.com/jimmysmith95/fixed-version"
+	_ "github.com/sdboyer/deptest"
 )
 
 func main() {
diff --git a/cmd/dep/testdata/ensure/bare_manifest.golden.json b/cmd/dep/testdata/ensure/empty/manifest.golden.json
similarity index 100%
rename from cmd/dep/testdata/ensure/bare_manifest.golden.json
rename to cmd/dep/testdata/ensure/empty/manifest.golden.json
diff --git a/cmd/dep/testdata/ensure/override/lock.golden.json b/cmd/dep/testdata/ensure/override/lock.golden.json
new file mode 100644
index 0000000000..9f0acd1845
--- /dev/null
+++ b/cmd/dep/testdata/ensure/override/lock.golden.json
@@ -0,0 +1,13 @@
+{
+    "memo": "70b47774699956441e395f458714b8e5800b54bebc73b046678245b9e1cfdc3b",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/deptest",
+            "version": "v1.0.0",
+            "revision": "ff2948a2ac8f538c4ecd55962e919d1e13e74baf",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}
diff --git a/cmd/dep/testdata/ensure/overrides_main.go b/cmd/dep/testdata/ensure/override/main.go
similarity index 64%
rename from cmd/dep/testdata/ensure/overrides_main.go
rename to cmd/dep/testdata/ensure/override/main.go
index 27fa78605c..2953533407 100644
--- a/cmd/dep/testdata/ensure/overrides_main.go
+++ b/cmd/dep/testdata/ensure/override/main.go
@@ -1,4 +1,4 @@
-// Copyright 2016 The Go Authors. All rights reserved.
+// Copyright 2017 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -6,7 +6,8 @@ package main
 
 import (
 	"fmt"
-	stuff "github.com/carolynvs/go-dep-test"
+
+	stuff "github.com/sdboyer/deptest"
 )
 
 func main() {
diff --git a/cmd/dep/testdata/ensure/override/manifest.golden.json b/cmd/dep/testdata/ensure/override/manifest.golden.json
new file mode 100644
index 0000000000..9ce6e06136
--- /dev/null
+++ b/cmd/dep/testdata/ensure/override/manifest.golden.json
@@ -0,0 +1,7 @@
+{
+    "overrides": {
+        "github.com/sdboyer/deptest": {
+            "version": "1.0.0"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/ensure/overrides_lock.golden.json b/cmd/dep/testdata/ensure/overrides_lock.golden.json
deleted file mode 100644
index 2bd94fd2f2..0000000000
--- a/cmd/dep/testdata/ensure/overrides_lock.golden.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "memo": "80807a008f7d8d26de122a8c6ad1f4c7286950b32e0488660afc57ccbbc037a1",
-    "projects": [
-        {
-            "name": "github.com/carolynvs/go-dep-test",
-            "version": "0.1.1",
-            "revision": "d15fa4b9d1330a469387f2873399d28ea1c463eb",
-            "packages": [
-                "."
-            ]
-        }
-    ]
-}
diff --git a/cmd/dep/testdata/ensure/overrides_manifest.golden.json b/cmd/dep/testdata/ensure/overrides_manifest.golden.json
deleted file mode 100644
index 3bfeb541e2..0000000000
--- a/cmd/dep/testdata/ensure/overrides_manifest.golden.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "overrides": {
-        "github.com/carolynvs/go-dep-test": {
-            "version": "0.1.1"
-        }
-    }
-}
diff --git a/cmd/dep/testdata/ensure/update/lock.golden.json b/cmd/dep/testdata/ensure/update/lock.golden.json
new file mode 100644
index 0000000000..c36607c20e
--- /dev/null
+++ b/cmd/dep/testdata/ensure/update/lock.golden.json
@@ -0,0 +1,21 @@
+{
+    "memo": "3ee7126505b016d4b9140dc3521b931380fd9d61fd1d1e6612d6b5b56b21baad",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/deptest",
+            "version": "v1.0.0",
+            "revision": "ff2948a2ac8f538c4ecd55962e919d1e13e74baf",
+            "packages": [
+                "."
+            ]
+        },
+        {
+            "name": "github.com/sdboyer/deptestdos",
+            "version": "v2.0.0",
+            "revision": "5c607206be5decd28e6263ffffdcee067266015e",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}
diff --git a/cmd/dep/testdata/ensure/update/lock.json b/cmd/dep/testdata/ensure/update/lock.json
new file mode 100644
index 0000000000..47cfd344d7
--- /dev/null
+++ b/cmd/dep/testdata/ensure/update/lock.json
@@ -0,0 +1,21 @@
+{
+    "memo": "9a5243dd3fa20feeaa20398e7283d6c566532e2af1aae279a010df34793761c5",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/deptest",
+            "version": "v0.8.0",
+            "revision": "ff2948a2ac8f538c4ecd55962e919d1e13e74baf",
+            "packages": [
+                "."
+            ]
+        },
+        {
+            "name": "github.com/sdboyer/deptestdos",
+            "version": "v2.0.0",
+            "revision": "5c607206be5decd28e6263ffffdcee067266015e",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}
diff --git a/cmd/dep/testdata/ensure/update/main.go b/cmd/dep/testdata/ensure/update/main.go
new file mode 100644
index 0000000000..2eae5b511d
--- /dev/null
+++ b/cmd/dep/testdata/ensure/update/main.go
@@ -0,0 +1,18 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"github.com/sdboyer/deptest"
+	"github.com/sdboyer/deptestdos"
+)
+
+func main() {
+	err := nil
+	if err != nil {
+		deptest.Map["yo yo!"]
+	}
+	deptestdos.diMeLo("whatev")
+}
diff --git a/cmd/dep/testdata/ensure/update/manifest.json b/cmd/dep/testdata/ensure/update/manifest.json
new file mode 100644
index 0000000000..dfc83c31bc
--- /dev/null
+++ b/cmd/dep/testdata/ensure/update/manifest.json
@@ -0,0 +1,7 @@
+{
+    "dependencies": {
+        "github.com/sdboyer/deptest": {
+            "version": "~0.8.0"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/ensure/update_lock.golden.json b/cmd/dep/testdata/ensure/update_lock.golden.json
deleted file mode 100644
index 7239c773c6..0000000000
--- a/cmd/dep/testdata/ensure/update_lock.golden.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "memo": "9a5243dd3fa20feeaa20398e7283d6c566532e2af1aae279a010df34793761c5",
-    "projects": [
-        {
-            "name": "github.com/carolynvs/go-dep-test",
-            "version": "0.1.1",
-            "revision": "40691983e4002d3a3f5879cc0f1fe99bedda148c",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/pkg/errors",
-            "branch": "v0.7.0",
-            "revision": "01fa4104b9c248c8945d14d9f128454d5b28d595",
-            "packages": [
-                "."
-            ]
-        }
-    ]
-}
diff --git a/cmd/dep/testdata/ensure/update_lock.json b/cmd/dep/testdata/ensure/update_lock.json
deleted file mode 100644
index 907c0372e0..0000000000
--- a/cmd/dep/testdata/ensure/update_lock.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "memo": "9a5243dd3fa20feeaa20398e7283d6c566532e2af1aae279a010df34793761c5",
-    "projects": [
-        {
-            "name": "github.com/carolynvs/go-dep-test",
-            "version": "0.1.0",
-            "revision": "b9c5511fa463628e6251554db29a4be161d02aed",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/pkg/errors",
-            "branch": "v0.7.0",
-            "revision": "01fa4104b9c248c8945d14d9f128454d5b28d595",
-            "packages": [
-                "."
-            ]
-        }
-    ]
-}
diff --git a/cmd/dep/testdata/ensure/update_main.go b/cmd/dep/testdata/ensure/update_main.go
deleted file mode 100644
index 28e46c204d..0000000000
--- a/cmd/dep/testdata/ensure/update_main.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	stuff "github.com/carolynvs/go-dep-test"
-	"github.com/pkg/errors"
-)
-
-func main() {
-	fmt.Println(stuff.Thing)
-	TryToDoSomething()
-}
-
-func TryToDoSomething() error {
-	return errors.New("I tried, Billy. I tried...")
-}
diff --git a/cmd/dep/testdata/ensure/update_manifest.json b/cmd/dep/testdata/ensure/update_manifest.json
deleted file mode 100644
index fb2ce6c93e..0000000000
--- a/cmd/dep/testdata/ensure/update_manifest.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "dependencies": {
-        "github.com/carolynvs/go-dep-test": {
-            "version": "~0.1.0"
-        }
-    }
-}
diff --git a/cmd/dep/testdata/init/bar.input.go b/cmd/dep/testdata/init/case1/bar.input.go
similarity index 70%
rename from cmd/dep/testdata/init/bar.input.go
rename to cmd/dep/testdata/init/case1/bar.input.go
index 9014beec88..c25c632feb 100644
--- a/cmd/dep/testdata/init/bar.input.go
+++ b/cmd/dep/testdata/init/case1/bar.input.go
@@ -4,4 +4,6 @@
 
 package bar
 
-const Qux = "yo yo!"
+import "github.com/sdboyer/deptest"
+
+const Qux = deptest.Map["yo yo!"]
diff --git a/cmd/dep/testdata/init/case1/lock.golden.json b/cmd/dep/testdata/init/case1/lock.golden.json
new file mode 100644
index 0000000000..7d1ccffab4
--- /dev/null
+++ b/cmd/dep/testdata/init/case1/lock.golden.json
@@ -0,0 +1,20 @@
+{
+    "memo": "",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/deptest",
+            "version": "v0.8.0",
+            "revision": "ff2948a2ac8f538c4ecd55962e919d1e13e74baf",
+            "packages": [
+                "."
+            ]
+        },
+        {
+            "name": "github.com/sdboyer/deptestdos",
+            "revision": "a0196baa11ea047dd65037287451d36b861b00ea",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}
diff --git a/cmd/dep/testdata/init/case1/manifest.golden.json b/cmd/dep/testdata/init/case1/manifest.golden.json
new file mode 100644
index 0000000000..edbbfc579e
--- /dev/null
+++ b/cmd/dep/testdata/init/case1/manifest.golden.json
@@ -0,0 +1,10 @@
+{
+    "dependencies": {
+        "github.com/sdboyer/deptest": {
+            "version": ">=0.8.0, <1.0.0"
+        },
+        "github.com/sdboyer/deptestdos": {
+            "revision": "a0196baa11ea047dd65037287451d36b861b00ea"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/init/thing.input.go b/cmd/dep/testdata/init/case1/thing.input.go
similarity index 71%
rename from cmd/dep/testdata/init/thing.input.go
rename to cmd/dep/testdata/init/case1/thing.input.go
index 67bde544ee..5ee0c5f85f 100644
--- a/cmd/dep/testdata/init/thing.input.go
+++ b/cmd/dep/testdata/init/case1/thing.input.go
@@ -5,16 +5,13 @@
 package main
 
 import (
-	"github.com/Sirupsen/logrus"
-	"github.com/pkg/errors"
-
 	"github.com/golang/notexist/foo/bar"
+	"github.com/sdboyer/deptestdos"
 )
 
 func main() {
 	err := nil
 	if err != nil {
-		errors.Wrap(err, "thing")
+		deptestdos.diMeLo(bar.Qux)
 	}
-	logrus.Info(bar.Qux)
 }
diff --git a/cmd/dep/testdata/init/case2/bar.input.go b/cmd/dep/testdata/init/case2/bar.input.go
new file mode 100644
index 0000000000..c25c632feb
--- /dev/null
+++ b/cmd/dep/testdata/init/case2/bar.input.go
@@ -0,0 +1,9 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package bar
+
+import "github.com/sdboyer/deptest"
+
+const Qux = deptest.Map["yo yo!"]
diff --git a/cmd/dep/testdata/init/case2/lock.golden.json b/cmd/dep/testdata/init/case2/lock.golden.json
new file mode 100644
index 0000000000..85a2364c75
--- /dev/null
+++ b/cmd/dep/testdata/init/case2/lock.golden.json
@@ -0,0 +1,21 @@
+{
+    "memo": "1792d407a795640a2b821b350f481bc48852535ed17c98cae2cbe2912a9c3e36",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/deptest",
+            "version": "v0.8.0",
+            "revision": "ff2948a2ac8f538c4ecd55962e919d1e13e74baf",
+            "packages": [
+                "."
+            ]
+        },
+        {
+            "name": "github.com/sdboyer/deptestdos",
+            "version": "v2.0.0",
+            "revision": "5c607206be5decd28e6263ffffdcee067266015e",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}
diff --git a/cmd/dep/testdata/init/case2/manifest.golden.json b/cmd/dep/testdata/init/case2/manifest.golden.json
new file mode 100644
index 0000000000..b3046136e3
--- /dev/null
+++ b/cmd/dep/testdata/init/case2/manifest.golden.json
@@ -0,0 +1,7 @@
+{
+    "dependencies": {
+        "github.com/sdboyer/deptest": {
+            "version": ">=0.8.0, <1.0.0"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/remove/main.input.go b/cmd/dep/testdata/init/case2/thing.input.go
similarity index 68%
rename from cmd/dep/testdata/remove/main.input.go
rename to cmd/dep/testdata/init/case2/thing.input.go
index cf8c3b1b65..5ee0c5f85f 100644
--- a/cmd/dep/testdata/remove/main.input.go
+++ b/cmd/dep/testdata/init/case2/thing.input.go
@@ -5,14 +5,13 @@
 package main
 
 import (
-	"github.com/Sirupsen/logrus"
-	"github.com/pkg/errors"
+	"github.com/golang/notexist/foo/bar"
+	"github.com/sdboyer/deptestdos"
 )
 
 func main() {
 	err := nil
 	if err != nil {
-		errors.Wrap(err, "thing")
+		deptestdos.diMeLo(bar.Qux)
 	}
-	logrus.Info("whatev")
 }
diff --git a/cmd/dep/testdata/init/case3/bar.input.go b/cmd/dep/testdata/init/case3/bar.input.go
new file mode 100644
index 0000000000..c25c632feb
--- /dev/null
+++ b/cmd/dep/testdata/init/case3/bar.input.go
@@ -0,0 +1,9 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package bar
+
+import "github.com/sdboyer/deptest"
+
+const Qux = deptest.Map["yo yo!"]
diff --git a/cmd/dep/testdata/init/case3/lock.golden.json b/cmd/dep/testdata/init/case3/lock.golden.json
new file mode 100644
index 0000000000..0552e42c05
--- /dev/null
+++ b/cmd/dep/testdata/init/case3/lock.golden.json
@@ -0,0 +1,20 @@
+{
+    "memo": "",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/deptest",
+            "branch": "master",
+            "revision": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
+            "packages": [
+                "."
+            ]
+        },
+        {
+            "name": "github.com/sdboyer/deptestdos",
+            "revision": "a0196baa11ea047dd65037287451d36b861b00ea",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}
diff --git a/cmd/dep/testdata/init/case3/manifest.golden.json b/cmd/dep/testdata/init/case3/manifest.golden.json
new file mode 100644
index 0000000000..7d73f23995
--- /dev/null
+++ b/cmd/dep/testdata/init/case3/manifest.golden.json
@@ -0,0 +1,10 @@
+{
+    "dependencies": {
+        "github.com/sdboyer/deptest": {
+            "branch": "master"
+        },
+        "github.com/sdboyer/deptestdos": {
+            "revision": "a0196baa11ea047dd65037287451d36b861b00ea"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/init/case3/thing.input.go b/cmd/dep/testdata/init/case3/thing.input.go
new file mode 100644
index 0000000000..5ee0c5f85f
--- /dev/null
+++ b/cmd/dep/testdata/init/case3/thing.input.go
@@ -0,0 +1,17 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"github.com/golang/notexist/foo/bar"
+	"github.com/sdboyer/deptestdos"
+)
+
+func main() {
+	err := nil
+	if err != nil {
+		deptestdos.diMeLo(bar.Qux)
+	}
+}
diff --git a/cmd/dep/testdata/init/lock.golden.json b/cmd/dep/testdata/init/lock.golden.json
deleted file mode 100644
index e3db80771b..0000000000
--- a/cmd/dep/testdata/init/lock.golden.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "memo": "668fe45796bc4e85a5a6c0a0f1eb6fab9e23588d1eb33f3a12b2ad5599a3575e",
-    "projects": [
-        {
-            "name": "github.com/Sirupsen/logrus",
-            "revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/pkg/errors",
-            "version": "v0.8.0",
-            "revision": "645ef00459ed84a119197bfb8d8205042c6df63d",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "golang.org/x/sys",
-            "branch": "master",
-            "revision": "{{sysCommit}}",
-            "packages": [
-                "unix"
-            ]
-        }
-    ]
-}
diff --git a/cmd/dep/testdata/init/manifest.golden.json b/cmd/dep/testdata/init/manifest.golden.json
deleted file mode 100644
index d5e0ba2cf4..0000000000
--- a/cmd/dep/testdata/init/manifest.golden.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "dependencies": {
-        "github.com/Sirupsen/logrus": {
-            "revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf"
-        },
-        "github.com/pkg/errors": {
-            "version": ">=0.8.0, <1.0.0"
-        }
-    }
-}
diff --git a/cmd/dep/testdata/remove/case0/main.go b/cmd/dep/testdata/remove/case0/main.go
new file mode 100644
index 0000000000..2eae5b511d
--- /dev/null
+++ b/cmd/dep/testdata/remove/case0/main.go
@@ -0,0 +1,18 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"github.com/sdboyer/deptest"
+	"github.com/sdboyer/deptestdos"
+)
+
+func main() {
+	err := nil
+	if err != nil {
+		deptest.Map["yo yo!"]
+	}
+	deptestdos.diMeLo("whatev")
+}
diff --git a/cmd/dep/testdata/remove/case0/manifest.golden.json b/cmd/dep/testdata/remove/case0/manifest.golden.json
new file mode 100644
index 0000000000..edbbfc579e
--- /dev/null
+++ b/cmd/dep/testdata/remove/case0/manifest.golden.json
@@ -0,0 +1,10 @@
+{
+    "dependencies": {
+        "github.com/sdboyer/deptest": {
+            "version": ">=0.8.0, <1.0.0"
+        },
+        "github.com/sdboyer/deptestdos": {
+            "revision": "a0196baa11ea047dd65037287451d36b861b00ea"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/remove/case0/manifest.input.json b/cmd/dep/testdata/remove/case0/manifest.input.json
new file mode 100644
index 0000000000..25d5d51ffa
--- /dev/null
+++ b/cmd/dep/testdata/remove/case0/manifest.input.json
@@ -0,0 +1,13 @@
+{
+    "dependencies": {
+        "github.com/not/used": {
+            "version": "2.0.0"
+        },
+        "github.com/sdboyer/deptest": {
+            "version": ">=0.8.0, <1.0.0"
+        },
+        "github.com/sdboyer/deptestdos": {
+            "revision": "a0196baa11ea047dd65037287451d36b861b00ea"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/remove/case1/main.go b/cmd/dep/testdata/remove/case1/main.go
new file mode 100644
index 0000000000..2eae5b511d
--- /dev/null
+++ b/cmd/dep/testdata/remove/case1/main.go
@@ -0,0 +1,18 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"github.com/sdboyer/deptest"
+	"github.com/sdboyer/deptestdos"
+)
+
+func main() {
+	err := nil
+	if err != nil {
+		deptest.Map["yo yo!"]
+	}
+	deptestdos.diMeLo("whatev")
+}
diff --git a/cmd/dep/testdata/remove/case1/manifest.golden.json b/cmd/dep/testdata/remove/case1/manifest.golden.json
new file mode 100644
index 0000000000..edbbfc579e
--- /dev/null
+++ b/cmd/dep/testdata/remove/case1/manifest.golden.json
@@ -0,0 +1,10 @@
+{
+    "dependencies": {
+        "github.com/sdboyer/deptest": {
+            "version": ">=0.8.0, <1.0.0"
+        },
+        "github.com/sdboyer/deptestdos": {
+            "revision": "a0196baa11ea047dd65037287451d36b861b00ea"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/remove/case1/manifest.input.json b/cmd/dep/testdata/remove/case1/manifest.input.json
new file mode 100644
index 0000000000..25d5d51ffa
--- /dev/null
+++ b/cmd/dep/testdata/remove/case1/manifest.input.json
@@ -0,0 +1,13 @@
+{
+    "dependencies": {
+        "github.com/not/used": {
+            "version": "2.0.0"
+        },
+        "github.com/sdboyer/deptest": {
+            "version": ">=0.8.0, <1.0.0"
+        },
+        "github.com/sdboyer/deptestdos": {
+            "revision": "a0196baa11ea047dd65037287451d36b861b00ea"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/remove/case2/lock.golden.json b/cmd/dep/testdata/remove/case2/lock.golden.json
new file mode 100644
index 0000000000..d5c096f360
--- /dev/null
+++ b/cmd/dep/testdata/remove/case2/lock.golden.json
@@ -0,0 +1,21 @@
+{
+    "memo": "1792d407a795640a2b821b350f481bc48852535ed17c98cae2cbe2912a9c3e36",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/deptest",
+            "version": "v1.0.0",
+            "revision": "ff2948a2ac8f538c4ecd55962e919d1e13e74baf",
+            "packages": [
+                "."
+            ]
+        },
+        {
+            "name": "github.com/sdboyer/deptestdos",
+            "version": "v2.0.0",
+            "revision": "5c607206be5decd28e6263ffffdcee067266015e",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}
diff --git a/cmd/dep/testdata/remove/case2/main.go b/cmd/dep/testdata/remove/case2/main.go
new file mode 100644
index 0000000000..2eae5b511d
--- /dev/null
+++ b/cmd/dep/testdata/remove/case2/main.go
@@ -0,0 +1,18 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"github.com/sdboyer/deptest"
+	"github.com/sdboyer/deptestdos"
+)
+
+func main() {
+	err := nil
+	if err != nil {
+		deptest.Map["yo yo!"]
+	}
+	deptestdos.diMeLo("whatev")
+}
diff --git a/cmd/dep/testdata/remove/case2/manifest.golden.json b/cmd/dep/testdata/remove/case2/manifest.golden.json
new file mode 100644
index 0000000000..b3046136e3
--- /dev/null
+++ b/cmd/dep/testdata/remove/case2/manifest.golden.json
@@ -0,0 +1,7 @@
+{
+    "dependencies": {
+        "github.com/sdboyer/deptest": {
+            "version": ">=0.8.0, <1.0.0"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/remove/case2/manifest.input.json b/cmd/dep/testdata/remove/case2/manifest.input.json
new file mode 100644
index 0000000000..25d5d51ffa
--- /dev/null
+++ b/cmd/dep/testdata/remove/case2/manifest.input.json
@@ -0,0 +1,13 @@
+{
+    "dependencies": {
+        "github.com/not/used": {
+            "version": "2.0.0"
+        },
+        "github.com/sdboyer/deptest": {
+            "version": ">=0.8.0, <1.0.0"
+        },
+        "github.com/sdboyer/deptestdos": {
+            "revision": "a0196baa11ea047dd65037287451d36b861b00ea"
+        }
+    }
+}
diff --git a/cmd/dep/testdata/remove/lock1.golden.json b/cmd/dep/testdata/remove/lock1.golden.json
deleted file mode 100644
index a6449ca6b4..0000000000
--- a/cmd/dep/testdata/remove/lock1.golden.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "memo": "7769242a737ed497aa39831eecfdc4a1bf59517df898907accc6bdc0f789a69b",
-    "projects": [
-        {
-            "name": "github.com/Sirupsen/logrus",
-            "revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/pkg/errors",
-            "version": "v0.8.0",
-            "revision": "645ef00459ed84a119197bfb8d8205042c6df63d",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "golang.org/x/sys",
-            "branch": "master",
-            "revision": "{{sysCommit}}",
-            "packages": [
-                "unix"
-            ]
-        }
-    ]
-}
diff --git a/cmd/dep/testdata/remove/manifest.input.json b/cmd/dep/testdata/remove/manifest.input.json
deleted file mode 100644
index a8404eebe6..0000000000
--- a/cmd/dep/testdata/remove/manifest.input.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "dependencies": {
-      "github.com/not/used": {
-          "version": "2.0.0"
-      },
-      "github.com/Sirupsen/logrus": {
-          "revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf"
-      },
-      "github.com/pkg/errors": {
-          "version": ">=0.8.0, <1.0.0"
-      }
-  }
-}
diff --git a/cmd/dep/testdata/remove/manifest0.golden.json b/cmd/dep/testdata/remove/manifest0.golden.json
deleted file mode 100644
index d5e0ba2cf4..0000000000
--- a/cmd/dep/testdata/remove/manifest0.golden.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "dependencies": {
-        "github.com/Sirupsen/logrus": {
-            "revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf"
-        },
-        "github.com/pkg/errors": {
-            "version": ">=0.8.0, <1.0.0"
-        }
-    }
-}
diff --git a/cmd/dep/testdata/remove/manifest1.golden.json b/cmd/dep/testdata/remove/manifest1.golden.json
deleted file mode 100644
index c07fa7e056..0000000000
--- a/cmd/dep/testdata/remove/manifest1.golden.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "dependencies": {
-        "github.com/Sirupsen/logrus": {
-            "revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf"
-        }
-    }
-}