diff --git a/command/command_test.go b/command/command_test.go
index 5062df4f1..9fa2d3500 100644
--- a/command/command_test.go
+++ b/command/command_test.go
@@ -28,6 +28,8 @@ import (
 	"github.com/hashicorp/terraform/helper/logging"
 	"github.com/hashicorp/terraform/plans"
 	"github.com/hashicorp/terraform/plans/planfile"
+	"github.com/hashicorp/terraform/providers"
+	"github.com/hashicorp/terraform/provisioners"
 	"github.com/hashicorp/terraform/states"
 	"github.com/hashicorp/terraform/states/statefile"
 	"github.com/hashicorp/terraform/states/statemgr"
@@ -94,31 +96,25 @@ func testFixturePath(name string) string {
 	return filepath.Join(fixtureDir, name)
 }
 
-func metaOverridesForProvider(p terraform.ResourceProvider) *testingOverrides {
+func metaOverridesForProvider(p providers.Interface) *testingOverrides {
 	return &testingOverrides{
-		ProviderResolver: terraform.ResourceProviderResolverFixed(
-			map[string]terraform.ResourceProviderFactory{
-				"test": func() (terraform.ResourceProvider, error) {
-					return p, nil
-				},
+		ProviderResolver: providers.ResolverFixed(
+			map[string]providers.Factory{
+				"test": providers.FactoryFixed(p),
 			},
 		),
 	}
 }
 
-func metaOverridesForProviderAndProvisioner(p terraform.ResourceProvider, pr terraform.ResourceProvisioner) *testingOverrides {
+func metaOverridesForProviderAndProvisioner(p providers.Interface, pr provisioners.Interface) *testingOverrides {
 	return &testingOverrides{
-		ProviderResolver: terraform.ResourceProviderResolverFixed(
-			map[string]terraform.ResourceProviderFactory{
-				"test": func() (terraform.ResourceProvider, error) {
-					return p, nil
-				},
+		ProviderResolver: providers.ResolverFixed(
+			map[string]providers.Factory{
+				"test": providers.FactoryFixed(p),
 			},
 		),
-		Provisioners: map[string]terraform.ResourceProvisionerFactory{
-			"shell": func() (terraform.ResourceProvisioner, error) {
-				return pr, nil
-			},
+		Provisioners: map[string]provisioners.Factory{
+			"shell": provisioners.FactoryFixed(pr),
 		},
 	}
 }
@@ -421,20 +417,16 @@ func testStateOutput(t *testing.T, path string, expected string) {
 	}
 }
 
-func testProvider() *terraform.MockResourceProvider {
-	p := new(terraform.MockResourceProvider)
-	p.DiffReturn = &terraform.InstanceDiff{}
-	p.RefreshFn = func(
-		info *terraform.InstanceInfo,
-		s *terraform.InstanceState) (*terraform.InstanceState, error) {
-		return s, nil
+func testProvider() *terraform.MockProvider {
+	p := new(terraform.MockProvider)
+	p.PlanResourceChangeResponse = providers.PlanResourceChangeResponse{
+		PlannedState: cty.EmptyObjectVal,
 	}
-	p.ResourcesReturn = []terraform.ResourceType{
-		terraform.ResourceType{
-			Name: "test_instance",
-		},
+	p.ReadResourceFn = func(req providers.ReadResourceRequest) providers.ReadResourceResponse {
+		return providers.ReadResourceResponse{
+			NewState: req.PriorState,
+		}
 	}
-
 	return p
 }
 
diff --git a/command/meta.go b/command/meta.go
index 5e6c4f08a..a8c1e323f 100644
--- a/command/meta.go
+++ b/command/meta.go
@@ -25,6 +25,7 @@ import (
 	"github.com/hashicorp/terraform/helper/experiment"
 	"github.com/hashicorp/terraform/helper/wrappedstreams"
 	"github.com/hashicorp/terraform/providers"
+	"github.com/hashicorp/terraform/provisioners"
 	"github.com/hashicorp/terraform/svchost/auth"
 	"github.com/hashicorp/terraform/svchost/disco"
 	"github.com/hashicorp/terraform/terraform"
@@ -171,7 +172,7 @@ type PluginOverrides struct {
 
 type testingOverrides struct {
 	ProviderResolver providers.Resolver
-	Provisioners     map[string]terraform.ProvisionerFactory
+	Provisioners     map[string]provisioners.Factory
 }
 
 // initStatePaths is used to initialize the default values for