diff --git a/command/test-fixtures/plan/main.tf b/command/test-fixtures/plan/main.tf
index 1ae9390485..93c28b2533 100644
--- a/command/test-fixtures/plan/main.tf
+++ b/command/test-fixtures/plan/main.tf
@@ -1,6 +1,7 @@
 resource "test_instance" "foo" {
     ami = "bar"
 
+    # This is here because at some point it caused a test failure
     network_interface {
       device_index = 0
       description = "Main network interface"
diff --git a/terraform/plan.go b/terraform/plan.go
index 3cabf97a25..13f468e3d0 100644
--- a/terraform/plan.go
+++ b/terraform/plan.go
@@ -11,6 +11,10 @@ import (
 	"github.com/hashicorp/terraform/config"
 )
 
+func init() {
+	gob.Register(make([]map[string]interface{}, 0))
+}
+
 // PlanOpts are the options used to generate an execution plan for
 // Terraform.
 type PlanOpts struct {