diff --git a/command/e2etest/primary_test.go b/command/e2etest/primary_test.go
index 074e4649e4..a16b2c2771 100644
--- a/command/e2etest/primary_test.go
+++ b/command/e2etest/primary_test.go
@@ -154,13 +154,13 @@ func TestPrimaryChdirOption(t *testing.T) {
 	defer tf.Close()
 
 	//// INIT
-	stdout, stderr, err := tf.Run("-chdir=subdir", "init")
+	_, stderr, err := tf.Run("-chdir=subdir", "init")
 	if err != nil {
 		t.Fatalf("unexpected init error: %s\nstderr:\n%s", err, stderr)
 	}
 
 	//// PLAN
-	stdout, stderr, err = tf.Run("-chdir=subdir", "plan", "-out=tfplan")
+	stdout, stderr, err := tf.Run("-chdir=subdir", "plan", "-out=tfplan")
 	if err != nil {
 		t.Fatalf("unexpected plan error: %s\nstderr:\n%s", err, stderr)
 	}
diff --git a/command/e2etest/providers_mirror_test.go b/command/e2etest/providers_mirror_test.go
index 5112fd8ebd..3d229e6b65 100644
--- a/command/e2etest/providers_mirror_test.go
+++ b/command/e2etest/providers_mirror_test.go
@@ -55,6 +55,9 @@ func TestTerraformProvidersMirror(t *testing.T) {
 	}
 	var got []string
 	walkErr := filepath.Walk(outputDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
 		if info.IsDir() {
 			return nil // we only care about leaf files for this test
 		}