diff --git a/azurerm/data_source_snapshot.go b/azurerm/data_source_snapshot.go
index d5f7a259877e..99008cc794ad 100644
--- a/azurerm/data_source_snapshot.go
+++ b/azurerm/data_source_snapshot.go
@@ -24,7 +24,7 @@ func dataSourceArmSnapshot() *schema.Resource {
 				Computed: true,
 			},
 			"disk_size_gb": {
-				Type:     schema.TypeString,
+				Type:     schema.TypeInt,
 				Computed: true,
 			},
 			"time_created": {
diff --git a/azurerm/data_source_snapshot_test.go b/azurerm/data_source_snapshot_test.go
index d6818cde5ade..df5b4fe5df0d 100644
--- a/azurerm/data_source_snapshot_test.go
+++ b/azurerm/data_source_snapshot_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform/helper/resource"
 )
 
-func TestAccDataSourceAzureRMSnapshot_importBasic(t *testing.T) {
+func TestAccDataSourceAzureRMSnapshot_basic(t *testing.T) {
 	dataSourceName := "data.azurerm_snapshot.snapshot"
 	ri := acctest.RandInt()
 
@@ -27,7 +27,7 @@ func TestAccDataSourceAzureRMSnapshot_importBasic(t *testing.T) {
 	})
 }
 
-func TestAccDataSourceAzureRMSnapshot_importEncryption(t *testing.T) {
+func TestAccDataSourceAzureRMSnapshot_encryption(t *testing.T) {
 	dataSourceName := "data.azurerm_snapshot.snapshot"
 	ri := acctest.RandInt()
 	rs := acctest.RandString(4)