diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go
index 8e7ccce388..d3a14f64da 100644
--- a/terraform/context_apply_test.go
+++ b/terraform/context_apply_test.go
@@ -835,17 +835,21 @@ func TestContext2Apply_cancel(t *testing.T) {
 	}
 
 	// Start the Apply in a goroutine
+	var applyErr error
 	stateCh := make(chan *State)
 	go func() {
 		state, err := ctx.Apply()
 		if err != nil {
-			panic(err)
+			applyErr = err
 		}
 
 		stateCh <- state
 	}()
 
 	state := <-stateCh
+	if applyErr != nil {
+		t.Fatalf("err: %s", applyErr)
+	}
 
 	mod := state.RootModule()
 	if len(mod.Resources) != 1 {