diff --git a/builtin/providers/terraform/flatten.go b/builtin/providers/terraform/flatten.go
deleted file mode 100644
index 4766a4f5e..000000000
--- a/builtin/providers/terraform/flatten.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package terraform
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// remoteStateFlatten takes a structure and turns into a flat map[string]string.
-//
-// Within the "thing" parameter, only primitive values are allowed. Structs are
-// not supported. Therefore, it can only be slices, maps, primitives, and
-// any combination of those together.
-//
-// The difference between this version and the version in package flatmap is that
-// we add the count key for maps in this version, and return a normal
-// map[string]string instead of a flatmap.Map
-func remoteStateFlatten(thing map[string]interface{}) map[string]string {
-	result := make(map[string]string)
-
-	for k, raw := range thing {
-		flatten(result, k, reflect.ValueOf(raw))
-	}
-
-	return result
-}
-
-func flatten(result map[string]string, prefix string, v reflect.Value) {
-	if v.Kind() == reflect.Interface {
-		v = v.Elem()
-	}
-
-	switch v.Kind() {
-	case reflect.Bool:
-		if v.Bool() {
-			result[prefix] = "true"
-		} else {
-			result[prefix] = "false"
-		}
-	case reflect.Int:
-		result[prefix] = fmt.Sprintf("%d", v.Int())
-	case reflect.Map:
-		flattenMap(result, prefix, v)
-	case reflect.Slice:
-		flattenSlice(result, prefix, v)
-	case reflect.String:
-		result[prefix] = v.String()
-	default:
-		panic(fmt.Sprintf("Unknown: %s", v))
-	}
-}
-
-func flattenMap(result map[string]string, prefix string, v reflect.Value) {
-	mapKeys := v.MapKeys()
-
-	result[fmt.Sprintf("%s.%%", prefix)] = fmt.Sprintf("%d", len(mapKeys))
-	for _, k := range mapKeys {
-		if k.Kind() == reflect.Interface {
-			k = k.Elem()
-		}
-
-		if k.Kind() != reflect.String {
-			panic(fmt.Sprintf("%s: map key is not string: %s", prefix, k))
-		}
-
-		flatten(result, fmt.Sprintf("%s.%s", prefix, k.String()), v.MapIndex(k))
-	}
-}
-
-func flattenSlice(result map[string]string, prefix string, v reflect.Value) {
-	prefix = prefix + "."
-
-	result[prefix+"#"] = fmt.Sprintf("%d", v.Len())
-	for i := 0; i < v.Len(); i++ {
-		flatten(result, fmt.Sprintf("%s%d", prefix, i), v.Index(i))
-	}
-}
diff --git a/builtin/providers/terraform/provider.go b/builtin/providers/terraform/provider.go
index 605362e3d..e33f14a71 100644
--- a/builtin/providers/terraform/provider.go
+++ b/builtin/providers/terraform/provider.go
@@ -17,7 +17,7 @@ type Provider struct {
 }
 
 // NewProvider returns a new terraform provider
-func NewProvider() *Provider {
+func NewProvider() providers.Interface {
 	return &Provider{}
 }
 
diff --git a/builtin/providers/terraform/provider_test.go b/builtin/providers/terraform/provider_test.go
index 2a3a2bfe9..fecf720d2 100644
--- a/builtin/providers/terraform/provider_test.go
+++ b/builtin/providers/terraform/provider_test.go
@@ -1,29 +1,10 @@
 package terraform
 
 import (
-	"testing"
-
-	"github.com/hashicorp/terraform/providers"
-
 	backendInit "github.com/hashicorp/terraform/backend/init"
 )
 
-var testAccProviders map[string]*Provider
-var testAccProvider *Provider
-
 func init() {
 	// Initialize the backends
 	backendInit.Init(nil)
-
-	testAccProvider = NewProvider()
-	testAccProviders = map[string]*Provider{
-		"terraform": testAccProvider,
-	}
-}
-
-func TestProvider_impl(t *testing.T) {
-	var _ providers.Interface = NewProvider()
-}
-
-func testAccPreCheck(t *testing.T) {
 }