diff --git a/terraform/context_test.go b/terraform/context_test.go
index ff8a9c993..70c5b2b6c 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -132,12 +132,11 @@ func TestContext2Plan_moduleInput(t *testing.T) {
 	}
 }
 
-/*
-func TestContextPlan_moduleInputComputed(t *testing.T) {
+func TestContext2Plan_moduleInputComputed(t *testing.T) {
 	m := testModule(t, "plan-module-input-computed")
 	p := testProvider("aws")
 	p.DiffFn = testDiffFn
-	ctx := testContext(t, &ContextOpts{
+	ctx := testContext2(t, &ContextOpts{
 		Module: m,
 		Providers: map[string]ResourceProviderFactory{
 			"aws": testProviderFuncFixed(p),
@@ -156,11 +155,11 @@ func TestContextPlan_moduleInputComputed(t *testing.T) {
 	}
 }
 
-func TestContextPlan_moduleInputFromVar(t *testing.T) {
+func TestContext2Plan_moduleInputFromVar(t *testing.T) {
 	m := testModule(t, "plan-module-input-var")
 	p := testProvider("aws")
 	p.DiffFn = testDiffFn
-	ctx := testContext(t, &ContextOpts{
+	ctx := testContext2(t, &ContextOpts{
 		Module: m,
 		Providers: map[string]ResourceProviderFactory{
 			"aws": testProviderFuncFixed(p),
@@ -181,11 +180,13 @@ func TestContextPlan_moduleInputFromVar(t *testing.T) {
 		t.Fatalf("bad:\n%s", actual)
 	}
 }
-func TestContextPlan_moduleMultiVar(t *testing.T) {
+
+/*
+func TestContext2Plan_moduleMultiVar(t *testing.T) {
 	m := testModule(t, "plan-module-multi-var")
 	p := testProvider("aws")
 	p.DiffFn = testDiffFn
-	ctx := testContext(t, &ContextOpts{
+	ctx := testContext2(t, &ContextOpts{
 		Module: m,
 		Providers: map[string]ResourceProviderFactory{
 			"aws": testProviderFuncFixed(p),
@@ -203,6 +204,7 @@ func TestContextPlan_moduleMultiVar(t *testing.T) {
 		t.Fatalf("bad:\n%s", actual)
 	}
 }
+
 func TestContextPlan_moduleOrphans(t *testing.T) {
 	m := testModule(t, "plan-modules-remove")
 	p := testProvider("aws")