diff --git a/builtin/providers/azurerm/import_arm_virtual_machine_test.go b/builtin/providers/azurerm/import_arm_virtual_machine_test.go
index 806d44987d15..dad79004994c 100644
--- a/builtin/providers/azurerm/import_arm_virtual_machine_test.go
+++ b/builtin/providers/azurerm/import_arm_virtual_machine_test.go
@@ -35,3 +35,31 @@ func TestAccAzureRMVirtualMachine_importBasic(t *testing.T) {
 		},
 	})
 }
+
+func TestAccAzureRMVirtualMachine_importBasic_managedDisk(t *testing.T) {
+	resourceName := "azurerm_virtual_machine.test"
+
+	ri := acctest.RandInt()
+	config := fmt.Sprintf(testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk, ri, ri, ri, ri, ri, ri)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMVirtualMachineDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: config,
+			},
+
+			resource.TestStep{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateVerifyIgnore: []string{
+					"delete_data_disks_on_termination",
+					"delete_os_disk_on_termination",
+				},
+			},
+		},
+	})
+}
diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine.go b/builtin/providers/azurerm/resource_arm_virtual_machine.go
index 3ba431a22d9d..7cc1d19b3977 100644
--- a/builtin/providers/azurerm/resource_arm_virtual_machine.go
+++ b/builtin/providers/azurerm/resource_arm_virtual_machine.go
@@ -12,6 +12,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/arm/compute"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/helper/validation"
 	riviera "github.com/jen20/riviera/azure"
 )
 
@@ -142,10 +143,27 @@ func resourceArmVirtualMachine() *schema.Resource {
 
 						"vhd_uri": {
 							Type:     schema.TypeString,
-							Required: true,
+							Optional: true,
 							ForceNew: true,
 						},
 
+						"managed_disk": {
+							Type:     schema.TypeMap,
+							Optional: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"storage_account_type": {
+										Type:     schema.TypeString,
+										Required: true,
+										ValidateFunc: validation.StringInSlice([]string{
+											string(compute.PremiumLRS),
+											string(compute.StandardLRS),
+										}, true),
+									},
+								},
+							},
+						},
+
 						"image_uri": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -190,7 +208,24 @@ func resourceArmVirtualMachine() *schema.Resource {
 
 						"vhd_uri": {
 							Type:     schema.TypeString,
-							Required: true,
+							Optional: true,
+						},
+
+						"managed_disk": {
+							Type:     schema.TypeMap,
+							Optional: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"storage_account_type": {
+										Type:     schema.TypeString,
+										Required: true,
+										ValidateFunc: validation.StringInSlice([]string{
+											string(compute.PremiumLRS),
+											string(compute.StandardLRS),
+										}, true),
+									},
+								},
+							},
 						},
 
 						"create_option": {
@@ -770,8 +805,15 @@ func resourceArmVirtualMachineStorageOsDiskHash(v interface{}) int {
 	var buf bytes.Buffer
 	m := v.(map[string]interface{})
 	buf.WriteString(fmt.Sprintf("%s-", m["name"].(string)))
-	buf.WriteString(fmt.Sprintf("%s-", m["vhd_uri"].(string)))
-
+	if m["vhd_uri"] != nil {
+		buf.WriteString(fmt.Sprintf("%s-", m["vhd_uri"].(string)))
+	}
+	if m["managed_disk"] != nil {
+		managedDisk := m["managed_disk"].(map[string]interface{})
+		if managedDisk["storage_account_type"] != nil {
+			buf.WriteString(fmt.Sprintf("%s-", managedDisk["storage_account_type"].(string)))
+		}
+	}
 	return hashcode.String(buf.String())
 }
 
@@ -869,7 +911,12 @@ func flattenAzureRmVirtualMachineDataDisk(disks *[]compute.DataDisk) interface{}
 	for i, disk := range *disks {
 		l := make(map[string]interface{})
 		l["name"] = *disk.Name
-		l["vhd_uri"] = *disk.Vhd.URI
+		if disk.Vhd != nil {
+			l["vhd_uri"] = *disk.Vhd.URI
+		}
+		if disk.ManagedDisk != nil {
+			l["managed_disk"] = flattenAzureRmVirtualMachineManagedDisk(disk.ManagedDisk)
+		}
 		l["create_option"] = disk.CreateOption
 		l["caching"] = string(disk.Caching)
 		if disk.DiskSizeGB != nil {
@@ -975,7 +1022,12 @@ func flattenAzureRmVirtualMachineOsProfileLinuxConfiguration(config *compute.Lin
 func flattenAzureRmVirtualMachineOsDisk(disk *compute.OSDisk) []interface{} {
 	result := make(map[string]interface{})
 	result["name"] = *disk.Name
-	result["vhd_uri"] = *disk.Vhd.URI
+	if disk.Vhd != nil {
+		result["vhd_uri"] = *disk.Vhd.URI
+	}
+	if disk.ManagedDisk != nil {
+		result["managed_disk"] = flattenAzureRmVirtualMachineManagedDisk(disk.ManagedDisk)
+	}
 	result["create_option"] = disk.CreateOption
 	result["caching"] = disk.Caching
 	if disk.DiskSizeGB != nil {
@@ -985,6 +1037,12 @@ func flattenAzureRmVirtualMachineOsDisk(disk *compute.OSDisk) []interface{} {
 	return []interface{}{result}
 }
 
+func flattenAzureRmVirtualMachineManagedDisk(params *compute.ManagedDiskParameters) map[string]interface{} {
+	managedDisk := make(map[string]interface{})
+	managedDisk["storage_account_type"] = string(params.StorageAccountType)
+	return managedDisk
+}
+
 func expandAzureRmVirtualMachinePlan(d *schema.ResourceData) (*compute.Plan, error) {
 	planConfigs := d.Get("plan").(*schema.Set).List()
 
@@ -1208,17 +1266,26 @@ func expandAzureRmVirtualMachineDataDisk(d *schema.ResourceData) ([]compute.Data
 
 		name := config["name"].(string)
 		vhd := config["vhd_uri"].(string)
+		managedDisk := config["managed_disk"].(map[string]interface{})
 		createOption := config["create_option"].(string)
 		lun := int32(config["lun"].(int))
 
 		data_disk := compute.DataDisk{
-			Name: &name,
-			Vhd: &compute.VirtualHardDisk{
-				URI: &vhd,
-			},
+			Name:         &name,
 			Lun:          &lun,
 			CreateOption: compute.DiskCreateOptionTypes(createOption),
 		}
+		if vhd != "" && managedDisk != nil {
+			return nil, fmt.Errorf("[ERROR] Conflict between `vhd_uri` and `managed_disk` (only one or the other can be used)")
+		} else if vhd != "" {
+			data_disk.Vhd = &compute.VirtualHardDisk{
+				URI: &vhd,
+			}
+		} else if managedDisk != nil {
+			data_disk.ManagedDisk = expandAzureRmVirtualMachineManagedDisk(managedDisk)
+		} else {
+			return nil, fmt.Errorf("[ERROR] A value must be specified for either `vhd_uri` or `managed_disk`")
+		}
 
 		if v := config["caching"].(string); v != "" {
 			data_disk.Caching = compute.CachingTypes(v)
@@ -1299,17 +1366,25 @@ func expandAzureRmVirtualMachineOsDisk(d *schema.ResourceData) (*compute.OSDisk,
 
 	name := disk["name"].(string)
 	vhdURI := disk["vhd_uri"].(string)
+	managedDisk := disk["managed_disk"].(map[string]interface{})
 	imageURI := disk["image_uri"].(string)
 	createOption := disk["create_option"].(string)
 
 	osDisk := &compute.OSDisk{
-		Name: &name,
-		Vhd: &compute.VirtualHardDisk{
-			URI: &vhdURI,
-		},
+		Name:         &name,
 		CreateOption: compute.DiskCreateOptionTypes(createOption),
 	}
 
+	if vhdURI != "" {
+		osDisk.Vhd = &compute.VirtualHardDisk{
+			URI: &vhdURI,
+		}
+	} else if managedDisk != nil {
+		osDisk.ManagedDisk = expandAzureRmVirtualMachineManagedDisk(managedDisk)
+	} else {
+		return nil, fmt.Errorf("[ERROR] must specify value for either vhd_uri or managed_disk")
+	}
+
 	if v := disk["image_uri"].(string); v != "" {
 		osDisk.Image = &compute.VirtualHardDisk{
 			URI: &imageURI,
@@ -1338,6 +1413,13 @@ func expandAzureRmVirtualMachineOsDisk(d *schema.ResourceData) (*compute.OSDisk,
 	return osDisk, nil
 }
 
+func expandAzureRmVirtualMachineManagedDisk(managedDisk map[string]interface{}) *compute.ManagedDiskParameters {
+	managedDiskParameters := &compute.ManagedDiskParameters{
+		StorageAccountType: compute.StorageAccountTypes(managedDisk["storage_account_type"].(string)),
+	}
+	return managedDiskParameters
+}
+
 func findStorageAccountResourceGroup(meta interface{}, storageAccountName string) (string, error) {
 	client := meta.(*ArmClient).resourceFindClient
 	filter := fmt.Sprintf("name eq '%s' and resourceType eq 'Microsoft.Storage/storageAccounts'", storageAccountName)
diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine_test.go b/builtin/providers/azurerm/resource_arm_virtual_machine_test.go
index b81ca08c07f1..3fbfc2c97a45 100644
--- a/builtin/providers/azurerm/resource_arm_virtual_machine_test.go
+++ b/builtin/providers/azurerm/resource_arm_virtual_machine_test.go
@@ -31,6 +31,25 @@ func TestAccAzureRMVirtualMachine_basicLinuxMachine(t *testing.T) {
 	})
 }
 
+func TestAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk(t *testing.T) {
+	var vm compute.VirtualMachine
+	ri := acctest.RandInt()
+	config := fmt.Sprintf(testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk, ri, ri, ri, ri, ri, ri)
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMVirtualMachineDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMVirtualMachineExists("azurerm_virtual_machine.test", &vm),
+				),
+			},
+		},
+	})
+}
+
 func TestAccAzureRMVirtualMachine_basicLinuxMachine_disappears(t *testing.T) {
 	var vm compute.VirtualMachine
 	ri := acctest.RandInt()
@@ -72,6 +91,26 @@ func TestAccAzureRMVirtualMachine_withDataDisk(t *testing.T) {
 	})
 }
 
+func TestAccAzureRMVirtualMachine_withDataDisk_managedDisk(t *testing.T) {
+	var vm compute.VirtualMachine
+
+	ri := acctest.RandInt()
+	config := fmt.Sprintf(testAccAzureRMVirtualMachine_withDataDisk_managedDisk, ri, ri, ri, ri, ri, ri)
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMVirtualMachineDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMVirtualMachineExists("azurerm_virtual_machine.test", &vm),
+				),
+			},
+		},
+	})
+}
+
 func TestAccAzureRMVirtualMachine_tags(t *testing.T) {
 	var vm compute.VirtualMachine
 
@@ -143,6 +182,39 @@ func TestAccAzureRMVirtualMachine_updateMachineSize(t *testing.T) {
 	})
 }
 
+//This is a regression test around https://github.com/hashicorp/terraform/issues/6517
+//Because we use CreateOrUpdate, we were sending an empty password on update requests
+func TestAccAzureRMVirtualMachine_updateMachineSize_managedDisk(t *testing.T) {
+	var vm compute.VirtualMachine
+
+	ri := acctest.RandInt()
+	preConfig := fmt.Sprintf(testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk, ri, ri, ri, ri, ri, ri)
+	postConfig := fmt.Sprintf(testAccAzureRMVirtualMachine_updatedLinuxMachine_managedDisk, ri, ri, ri, ri, ri, ri)
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMVirtualMachineDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: preConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMVirtualMachineExists("azurerm_virtual_machine.test", &vm),
+					resource.TestCheckResourceAttr(
+						"azurerm_virtual_machine.test", "vm_size", "Standard_A0"),
+				),
+			},
+			{
+				Config: postConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMVirtualMachineExists("azurerm_virtual_machine.test", &vm),
+					resource.TestCheckResourceAttr(
+						"azurerm_virtual_machine.test", "vm_size", "Standard_DS1_v2"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccAzureRMVirtualMachine_basicWindowsMachine(t *testing.T) {
 	var vm compute.VirtualMachine
 	ri := acctest.RandInt()
@@ -583,13 +655,13 @@ func TestAccAzureRMVirtualMachine_windowsLicenseType(t *testing.T) {
 var testAccAzureRMVirtualMachine_basicLinuxMachine = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -602,7 +674,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -615,7 +687,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -632,7 +704,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -669,16 +741,90 @@ resource "azurerm_virtual_machine" "test" {
 }
 `
 
+var testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk = `
+resource "azurerm_resource_group" "test" {
+    name = "acctestRG-%d"
+    location = "West US 2"
+}
+
+resource "azurerm_virtual_network" "test" {
+    name = "acctvn-%d"
+    address_space = ["10.0.0.0/16"]
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+}
+
+resource "azurerm_subnet" "test" {
+    name = "acctsub-%d"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+    virtual_network_name = "${azurerm_virtual_network.test.name}"
+    address_prefix = "10.0.2.0/24"
+}
+
+resource "azurerm_network_interface" "test" {
+    name = "acctni-%d"
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+
+    ip_configuration {
+    	name = "testconfiguration1"
+    	subnet_id = "${azurerm_subnet.test.id}"
+    	private_ip_address_allocation = "dynamic"
+    }
+}
+
+resource "azurerm_virtual_machine" "test" {
+    name = "acctvm-%d"
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+    network_interface_ids = ["${azurerm_network_interface.test.id}"]
+    vm_size = "Standard_A0"
+
+    storage_image_reference {
+	publisher = "Canonical"
+	offer = "UbuntuServer"
+	sku = "14.04.2-LTS"
+	version = "latest"
+    }
+
+    storage_os_disk {
+        name = "myosdisk1"
+        caching = "ReadWrite"
+        create_option = "FromImage"
+        disk_size_gb = "45"
+
+        managed_disk {
+            storage_account_type = "Standard_LRS"
+        }
+    }
+
+    os_profile {
+	computer_name = "hostname%d"
+	admin_username = "testadmin"
+	admin_password = "Password1234!"
+    }
+
+    os_profile_linux_config {
+	disable_password_authentication = false
+    }
+
+    tags {
+    	environment = "Production"
+    	cost-center = "Ops"
+    }
+}
+`
+
 var testAccAzureRMVirtualMachine_machineNameBeforeUpdate = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -691,7 +837,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -704,7 +850,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -721,7 +867,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -761,18 +907,18 @@ resource "azurerm_virtual_machine" "test" {
 var testAccAzureRMVirtualMachine_basicLinuxMachineDestroyDisksBefore = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_resource_group" "test-sa" {
     name = "acctestRG-sa-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -785,7 +931,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -798,7 +944,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test-sa.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -815,7 +961,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -866,18 +1012,18 @@ resource "azurerm_virtual_machine" "test" {
 var testAccAzureRMVirtualMachine_basicLinuxMachineDestroyDisksAfter = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_resource_group" "test-sa" {
     name = "acctestRG-sa-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -890,7 +1036,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -903,7 +1049,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test-sa.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -922,13 +1068,13 @@ resource "azurerm_storage_container" "test" {
 var testAccAzureRMVirtualMachine_basicLinuxMachineDeleteVM = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -941,7 +1087,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -954,7 +1100,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -973,13 +1119,13 @@ resource "azurerm_storage_container" "test" {
 var testAccAzureRMVirtualMachine_withDataDisk = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -992,7 +1138,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -1005,7 +1151,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -1022,7 +1168,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -1067,16 +1213,101 @@ resource "azurerm_virtual_machine" "test" {
 }
 `
 
+var testAccAzureRMVirtualMachine_withDataDisk_managedDisk = `
+resource "azurerm_resource_group" "test" {
+    name = "acctestRG-%d"
+    location = "West US 2"
+}
+
+resource "azurerm_virtual_network" "test" {
+    name = "acctvn-%d"
+    address_space = ["10.0.0.0/16"]
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+}
+
+resource "azurerm_subnet" "test" {
+    name = "acctsub-%d"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+    virtual_network_name = "${azurerm_virtual_network.test.name}"
+    address_prefix = "10.0.2.0/24"
+}
+
+resource "azurerm_network_interface" "test" {
+    name = "acctni-%d"
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+
+    ip_configuration {
+    	name = "testconfiguration1"
+    	subnet_id = "${azurerm_subnet.test.id}"
+    	private_ip_address_allocation = "dynamic"
+    }
+}
+
+resource "azurerm_virtual_machine" "test" {
+    name = "acctvm-%d"
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+    network_interface_ids = ["${azurerm_network_interface.test.id}"]
+    vm_size = "Standard_DS1_v2"
+
+    storage_image_reference {
+	publisher = "Canonical"
+	offer = "UbuntuServer"
+	sku = "14.04.2-LTS"
+	version = "latest"
+    }
+
+    storage_os_disk {
+        name = "myosdisk1"
+        caching = "ReadWrite"
+        create_option = "FromImage"
+
+        managed_disk {
+            storage_account_type = "Standard_LRS"
+        }
+    }
+
+    storage_data_disk {
+        name          = "mydatadisk1"
+    	disk_size_gb  = "1023"
+    	create_option = "Empty"
+        caching       = "ReadWrite"
+    	lun           = 0
+
+    	managed_disk {
+    	    storage_account_type = "Premium_LRS"
+    	}
+    }
+
+    os_profile {
+	computer_name = "hostname%d"
+	admin_username = "testadmin"
+	admin_password = "Password1234!"
+    }
+
+    os_profile_linux_config {
+	disable_password_authentication = false
+    }
+
+    tags {
+    	environment = "Production"
+    	cost-center = "Ops"
+    }
+}
+`
+
 var testAccAzureRMVirtualMachine_basicLinuxMachineUpdated = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -1089,7 +1320,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -1102,7 +1333,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -1119,7 +1350,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -1154,16 +1385,88 @@ resource "azurerm_virtual_machine" "test" {
 }
 `
 
+var testAccAzureRMVirtualMachine_basicLinuxMachineUpdated_managedDisk = `
+resource "azurerm_resource_group" "test" {
+    name = "acctestRG-%d"
+    location = "West US 2"
+}
+
+resource "azurerm_virtual_network" "test" {
+    name = "acctvn-%d"
+    address_space = ["10.0.0.0/16"]
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+}
+
+resource "azurerm_subnet" "test" {
+    name = "acctsub-%d"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+    virtual_network_name = "${azurerm_virtual_network.test.name}"
+    address_prefix = "10.0.2.0/24"
+}
+
+resource "azurerm_network_interface" "test" {
+    name = "acctni-%d"
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+
+    ip_configuration {
+    	name = "testconfiguration1"
+    	subnet_id = "${azurerm_subnet.test.id}"
+    	private_ip_address_allocation = "dynamic"
+    }
+}
+
+resource "azurerm_virtual_machine" "test" {
+    name = "acctvm-%d"
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+    network_interface_ids = ["${azurerm_network_interface.test.id}"]
+    vm_size = "Standard_DS1_v2"
+
+    storage_image_reference {
+	publisher = "Canonical"
+	offer = "UbuntuServer"
+	sku = "14.04.2-LTS"
+	version = "latest"
+    }
+
+    storage_os_disk {
+        name = "myosdisk1"
+        caching = "ReadWrite"
+        create_option = "FromImage"
+
+        managed_disk {
+            storage_account_type = "Premium_LRS"
+        }
+    }
+
+    os_profile {
+	computer_name = "hostname%d"
+	admin_username = "testadmin"
+	admin_password = "Password1234!"
+    }
+
+    os_profile_linux_config {
+	disable_password_authentication = false
+    }
+
+    tags {
+    	environment = "Production"
+    }
+}
+`
+
 var testAccAzureRMVirtualMachine_updatedLinuxMachine = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -1176,7 +1479,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -1189,7 +1492,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -1206,7 +1509,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A1"
@@ -1237,16 +1540,84 @@ resource "azurerm_virtual_machine" "test" {
 }
 `
 
+var testAccAzureRMVirtualMachine_updatedLinuxMachine_managedDisk = `
+resource "azurerm_resource_group" "test" {
+    name = "acctestRG-%d"
+    location = "West US 2"
+}
+
+resource "azurerm_virtual_network" "test" {
+    name = "acctvn-%d"
+    address_space = ["10.0.0.0/16"]
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+}
+
+resource "azurerm_subnet" "test" {
+    name = "acctsub-%d"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+    virtual_network_name = "${azurerm_virtual_network.test.name}"
+    address_prefix = "10.0.2.0/24"
+}
+
+resource "azurerm_network_interface" "test" {
+    name = "acctni-%d"
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+
+    ip_configuration {
+    	name = "testconfiguration1"
+    	subnet_id = "${azurerm_subnet.test.id}"
+    	private_ip_address_allocation = "dynamic"
+    }
+}
+
+resource "azurerm_virtual_machine" "test" {
+    name = "acctvm-%d"
+    location = "West US 2"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+    network_interface_ids = ["${azurerm_network_interface.test.id}"]
+    vm_size = "Standard_DS1_v2"
+
+    storage_image_reference {
+	publisher = "Canonical"
+	offer = "UbuntuServer"
+	sku = "14.04.2-LTS"
+	version = "latest"
+    }
+
+    storage_os_disk {
+        name = "myosdisk1"
+        caching = "ReadWrite"
+        create_option = "FromImage"
+
+        managed_disk {
+            storage_account_type = "Premium_LRS"
+        }
+    }
+
+    os_profile {
+	computer_name = "hostname%d"
+	admin_username = "testadmin"
+	admin_password = "Password1234!"
+    }
+
+    os_profile_linux_config {
+	disable_password_authentication = false
+    }
+}
+`
+
 var testAccAzureRMVirtualMachine_basicWindowsMachine = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -1259,7 +1630,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -1272,7 +1643,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -1289,7 +1660,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -1324,13 +1695,13 @@ resource "azurerm_virtual_machine" "test" {
 var testAccAzureRMVirtualMachine_windowsUnattendedConfig = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -1343,7 +1714,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -1356,7 +1727,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -1373,7 +1744,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -1414,13 +1785,13 @@ resource "azurerm_virtual_machine" "test" {
 var testAccAzureRMVirtualMachine_diagnosticsProfile = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -1433,7 +1804,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -1446,7 +1817,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -1463,7 +1834,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -1505,13 +1876,13 @@ resource "azurerm_virtual_machine" "test" {
 var testAccAzureRMVirtualMachine_winRMConfig = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -1524,7 +1895,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -1537,7 +1908,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -1554,7 +1925,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -1590,13 +1961,13 @@ resource "azurerm_virtual_machine" "test" {
 var testAccAzureRMVirtualMachine_withAvailabilitySet = `
  resource "azurerm_resource_group" "test" {
      name = "acctestRG-%d"
-     location = "West US"
+     location = "West US 2"
  }
 
  resource "azurerm_virtual_network" "test" {
      name = "acctvn-%d"
      address_space = ["10.0.0.0/16"]
-     location = "West US"
+     location = "West US 2"
      resource_group_name = "${azurerm_resource_group.test.name}"
  }
 
@@ -1609,7 +1980,7 @@ var testAccAzureRMVirtualMachine_withAvailabilitySet = `
 
  resource "azurerm_network_interface" "test" {
      name = "acctni-%d"
-     location = "West US"
+     location = "West US 2"
      resource_group_name = "${azurerm_resource_group.test.name}"
 
      ip_configuration {
@@ -1622,7 +1993,7 @@ var testAccAzureRMVirtualMachine_withAvailabilitySet = `
  resource "azurerm_storage_account" "test" {
      name = "accsa%d"
      resource_group_name = "${azurerm_resource_group.test.name}"
-     location = "westus"
+     location = "West US 2"
      account_type = "Standard_LRS"
 
      tags {
@@ -1632,7 +2003,7 @@ var testAccAzureRMVirtualMachine_withAvailabilitySet = `
 
  resource "azurerm_availability_set" "test" {
     name = "availabilityset%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -1645,7 +2016,7 @@ var testAccAzureRMVirtualMachine_withAvailabilitySet = `
 
  resource "azurerm_virtual_machine" "test" {
      name = "acctvm-%d"
-     location = "West US"
+     location = "West US 2"
      resource_group_name = "${azurerm_resource_group.test.name}"
      network_interface_ids = ["${azurerm_network_interface.test.id}"]
      vm_size = "Standard_A0"
@@ -1681,13 +2052,13 @@ var testAccAzureRMVirtualMachine_withAvailabilitySet = `
 var testAccAzureRMVirtualMachine_updateAvailabilitySet = `
  resource "azurerm_resource_group" "test" {
      name = "acctestRG-%d"
-     location = "West US"
+     location = "West US 2"
  }
 
  resource "azurerm_virtual_network" "test" {
      name = "acctvn-%d"
      address_space = ["10.0.0.0/16"]
-     location = "West US"
+     location = "West US 2"
      resource_group_name = "${azurerm_resource_group.test.name}"
  }
 
@@ -1700,7 +2071,7 @@ var testAccAzureRMVirtualMachine_updateAvailabilitySet = `
 
  resource "azurerm_network_interface" "test" {
      name = "acctni-%d"
-     location = "West US"
+     location = "West US 2"
      resource_group_name = "${azurerm_resource_group.test.name}"
 
      ip_configuration {
@@ -1713,7 +2084,7 @@ var testAccAzureRMVirtualMachine_updateAvailabilitySet = `
  resource "azurerm_storage_account" "test" {
      name = "accsa%d"
      resource_group_name = "${azurerm_resource_group.test.name}"
-     location = "westus"
+     location = "West US 2"
      account_type = "Standard_LRS"
 
      tags {
@@ -1723,7 +2094,7 @@ var testAccAzureRMVirtualMachine_updateAvailabilitySet = `
 
  resource "azurerm_availability_set" "test" {
     name = "updatedAvailabilitySet%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -1736,7 +2107,7 @@ var testAccAzureRMVirtualMachine_updateAvailabilitySet = `
 
  resource "azurerm_virtual_machine" "test" {
      name = "acctvm-%d"
-     location = "West US"
+     location = "West US 2"
      resource_group_name = "${azurerm_resource_group.test.name}"
      network_interface_ids = ["${azurerm_network_interface.test.id}"]
      vm_size = "Standard_A0"
@@ -1772,13 +2143,13 @@ var testAccAzureRMVirtualMachine_updateAvailabilitySet = `
 var testAccAzureRMVirtualMachine_updateMachineName = `
  resource "azurerm_resource_group" "test" {
      name = "acctestRG-%d"
-     location = "West US"
+     location = "West US 2"
  }
 
  resource "azurerm_virtual_network" "test" {
      name = "acctvn-%d"
      address_space = ["10.0.0.0/16"]
-     location = "West US"
+     location = "West US 2"
      resource_group_name = "${azurerm_resource_group.test.name}"
  }
 
@@ -1791,7 +2162,7 @@ var testAccAzureRMVirtualMachine_updateMachineName = `
 
  resource "azurerm_network_interface" "test" {
      name = "acctni-%d"
-     location = "West US"
+     location = "West US 2"
      resource_group_name = "${azurerm_resource_group.test.name}"
 
      ip_configuration {
@@ -1804,7 +2175,7 @@ var testAccAzureRMVirtualMachine_updateMachineName = `
  resource "azurerm_storage_account" "test" {
      name = "accsa%d"
      resource_group_name = "${azurerm_resource_group.test.name}"
-     location = "westus"
+     location = "West US 2"
      account_type = "Standard_LRS"
 
      tags {
@@ -1821,7 +2192,7 @@ var testAccAzureRMVirtualMachine_updateMachineName = `
 
  resource "azurerm_virtual_machine" "test" {
      name = "acctvm-%d"
-     location = "West US"
+     location = "West US 2"
      resource_group_name = "${azurerm_resource_group.test.name}"
      network_interface_ids = ["${azurerm_network_interface.test.id}"]
      vm_size = "Standard_A0"
@@ -1856,13 +2227,13 @@ var testAccAzureRMVirtualMachine_updateMachineName = `
 var testAccAzureRMVirtualMachine_basicLinuxMachineStorageImageBefore = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -1875,7 +2246,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -1888,7 +2259,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -1905,7 +2276,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -1946,13 +2317,13 @@ resource "azurerm_virtual_machine" "test" {
 var testAccAzureRMVirtualMachine_basicLinuxMachineStorageImageAfter = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -1965,7 +2336,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -1978,7 +2349,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -1995,7 +2366,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -2036,13 +2407,13 @@ resource "azurerm_virtual_machine" "test" {
 var testAccAzureRMVirtualMachine_basicLinuxMachineWithOSDiskVhdUriChanged = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -2055,7 +2426,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -2068,7 +2439,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -2085,7 +2456,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -2125,13 +2496,13 @@ resource "azurerm_virtual_machine" "test" {
 var testAccAzureRMVirtualMachine_windowsLicenseType = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -2144,7 +2515,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -2157,7 +2528,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -2174,7 +2545,7 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
     vm_size = "Standard_A0"
@@ -2210,13 +2581,13 @@ resource "azurerm_virtual_machine" "test" {
 var testAccAzureRMVirtualMachine_plan = `
 resource "azurerm_resource_group" "test" {
     name = "acctestRG-%d"
-    location = "West US"
+    location = "West US 2"
 }
 
 resource "azurerm_virtual_network" "test" {
     name = "acctvn-%d"
     address_space = ["10.0.0.0/16"]
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
@@ -2229,7 +2600,7 @@ resource "azurerm_subnet" "test" {
 
 resource "azurerm_network_interface" "test" {
     name = "acctni-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
 
     ip_configuration {
@@ -2242,7 +2613,7 @@ resource "azurerm_network_interface" "test" {
 resource "azurerm_storage_account" "test" {
     name = "accsa%d"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
+    location = "West US 2"
     account_type = "Standard_LRS"
 
     tags {
@@ -2259,10 +2630,10 @@ resource "azurerm_storage_container" "test" {
 
 resource "azurerm_virtual_machine" "test" {
     name = "acctvm-%d"
-    location = "West US"
+    location = "West US 2"
     resource_group_name = "${azurerm_resource_group.test.name}"
     network_interface_ids = ["${azurerm_network_interface.test.id}"]
-    vm_size = "Standard_DS1_v2"
+    vm_size = "Standard_DS1_v2_v2"
 
     storage_image_reference {
 	publisher = "kemptech"