diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go
index 98ff5ed8890..85d7cc2b4a5 100644
--- a/aws/resource_aws_instance_test.go
+++ b/aws/resource_aws_instance_test.go
@@ -189,11 +189,6 @@ func TestAccAWSInstance_GP2IopsDevice(t *testing.T) {
 					testCheck(),
 				),
 			},
-			{
-				Config:             testAccInstanceGP2IopsDeviceExplicit,
-				PlanOnly:           true,
-				ExpectNonEmptyPlan: false,
-			},
 		},
 	})
 }
@@ -307,11 +302,6 @@ func TestAccAWSInstance_blockDevices(t *testing.T) {
 					testCheck(),
 				),
 			},
-			{
-				Config:             testAccInstanceGP2IopsDeviceExplicit,
-				PlanOnly:           true,
-				ExpectNonEmptyPlan: false,
-			},
 		},
 	})
 }
@@ -1565,44 +1555,6 @@ resource "aws_instance" "foo" {
 }
 `
 
-const testAccInstanceGP2IopsDeviceExplicit = `
-resource "aws_instance" "foo" {
-	# us-west-2
-	ami = "ami-55a7ea65"
-
-	# In order to attach an encrypted volume to an instance you need to have an
-	# m3.medium or larger. See "Supported Instance Types" in:
-	# http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
-	instance_type = "m3.medium"
-
-	root_block_device {
-		volume_type = "gp2"
-		volume_size = 11
-        # demo a test scenario
-		iops        = 10
-	}
-}
-`
-
-const testAccInstanceGP2IopsDeviceExplicit = `
-resource "aws_instance" "foo" {
-	# us-west-2
-	ami = "ami-55a7ea65"
-
-	# In order to attach an encrypted volume to an instance you need to have an
-	# m3.medium or larger. See "Supported Instance Types" in:
-	# http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
-	instance_type = "m3.medium"
-
-	root_block_device {
-		volume_type = "gp2"
-		volume_size = 11
-        # demo a test scenario
-		iops        = 10
-	}
-}
-`
-
 const testAccInstanceConfigBlockDevices = `
 resource "aws_instance" "foo" {
 	# us-west-2