diff --git a/builtin/providers/azurerm/resource_arm_network_interface_card_test.go b/builtin/providers/azurerm/resource_arm_network_interface_card_test.go
index 771a24b2c..7dd61715a 100644
--- a/builtin/providers/azurerm/resource_arm_network_interface_card_test.go
+++ b/builtin/providers/azurerm/resource_arm_network_interface_card_test.go
@@ -98,35 +98,6 @@ func TestAccAzureRMNetworkInterface_withTags(t *testing.T) {
 	})
 }
 
-///TODO: Re-enable this test when https://github.com/Azure/azure-sdk-for-go/issues/259 is fixed
-//func TestAccAzureRMNetworkInterface_addingIpConfigurations(t *testing.T) {
-//
-//	resource.Test(t, resource.TestCase{
-//		PreCheck:     func() { testAccPreCheck(t) },
-//		Providers:    testAccProviders,
-//		CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy,
-//		Steps: []resource.TestStep{
-//			resource.TestStep{
-//				Config: testAccAzureRMNetworkInterface_basic,
-//				Check: resource.ComposeTestCheckFunc(
-//					testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test"),
-//					resource.TestCheckResourceAttr(
-//						"azurerm_network_interface.test", "ip_configuration.#", "1"),
-//				),
-//			},
-//
-//			resource.TestStep{
-//				Config: testAccAzureRMNetworkInterface_extraIpConfiguration,
-//				Check: resource.ComposeTestCheckFunc(
-//					testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test"),
-//					resource.TestCheckResourceAttr(
-//						"azurerm_network_interface.test", "ip_configuration.#", "2"),
-//				),
-//			},
-//		},
-//	})
-//}
-
 func testCheckAzureRMNetworkInterfaceExists(name string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		// Ensure we have enough information in state to look up in API
@@ -355,51 +326,3 @@ resource "azurerm_network_interface" "test" {
 }
 `, rInt)
 }
-
-//TODO: Re-enable this test when https://github.com/Azure/azure-sdk-for-go/issues/259 is fixed
-//var testAccAzureRMNetworkInterface_extraIpConfiguration = `
-//resource "azurerm_resource_group" "test" {
-//    name = "acceptanceTestResourceGroup1"
-//    location = "West US"
-//}
-//
-//resource "azurerm_virtual_network" "test" {
-//    name = "acceptanceTestVirtualNetwork1"
-//    address_space = ["10.0.0.0/16"]
-//    location = "West US"
-//    resource_group_name = "${azurerm_resource_group.test.name}"
-//}
-//
-//resource "azurerm_subnet" "test" {
-//    name = "testsubnet"
-//    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_subnet" "test1" {
-//    name = "testsubnet1"
-//    resource_group_name = "${azurerm_resource_group.test.name}"
-//    virtual_network_name = "${azurerm_virtual_network.test.name}"
-//    address_prefix = "10.0.1.0/24"
-//}
-//
-//resource "azurerm_network_interface" "test" {
-//    name = "acceptanceTestNetworkInterface1"
-//    location = "West US"
-//    resource_group_name = "${azurerm_resource_group.test.name}"
-//
-//    ip_configuration {
-//    	name = "testconfiguration1"
-//    	subnet_id = "${azurerm_subnet.test.id}"
-//    	private_ip_address_allocation = "dynamic"
-//    }
-//
-//    ip_configuration {
-//    	name = "testconfiguration2"
-//    	subnet_id = "${azurerm_subnet.test1.id}"
-//    	private_ip_address_allocation = "dynamic"
-//    	primary = true
-//    }
-//}
-//`
diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go b/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go
index 7a5c7d629..440cd7610 100644
--- a/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go
+++ b/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go
@@ -48,25 +48,6 @@ func TestAccAzureRMVirtualMachineScaleSet_basicLinux_disappears(t *testing.T) {
 	})
 }
 
-//func TestAccAzureRMVirtualMachineScaleSet_basicWindowsMachine(t *testing.T) {
-//	ri := acctest.RandInt()
-//	rs := acctest.RandString(6)
-//	config := fmt.Sprintf(testAccAzureRMVirtualMachineScaleSet_basicWindows, ri, ri, ri, ri, ri, ri, rs, ri)
-//	resource.Test(t, resource.TestCase{
-//		PreCheck:     func() { testAccPreCheck(t) },
-//		Providers:    testAccProviders,
-//		CheckDestroy: testCheckAzureRMVirtualMachineScaleSetDestroy,
-//		Steps: []resource.TestStep{
-//			{
-//				Config: config,
-//				Check: resource.ComposeTestCheckFunc(
-//					testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"),
-//				),
-//			},
-//		},
-//	})
-//}
-
 func testCheckAzureRMVirtualMachineScaleSetExists(name string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		// Ensure we have enough information in state to look up in API
@@ -238,96 +219,3 @@ resource "azurerm_virtual_machine_scale_set" "test" {
   }
 }
 `
-
-var testAccAzureRMVirtualMachineScaleSet_basicWindows = `
-resource "azurerm_resource_group" "test" {
-    name = "acctestRG-%d"
-    location = "West US"
-}
-
-resource "azurerm_virtual_network" "test" {
-    name = "acctvn-%d"
-    address_space = ["10.0.0.0/16"]
-    location = "West US"
-    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"
-    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_storage_account" "test" {
-    name = "accsa%d"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    location = "westus"
-    account_type = "Standard_LRS"
-
-    tags {
-        environment = "staging"
-    }
-}
-
-resource "azurerm_storage_container" "test" {
-    name = "vhds"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    storage_account_name = "${azurerm_storage_account.test.name}"
-    container_access_type = "private"
-}
-
-resource "azurerm_virtual_machine_scale_set" "test" {
-  name = "acctvmss-%d"
-  location = "West US"
-  resource_group_name = "${azurerm_resource_group.test.name}"
-  upgrade_policy_mode = "Manual"
-
-  sku {
-    name = "Standard_A0"
-    tier = "Standard"
-    capacity = 2
-  }
-
-  os_profile {
-    computer_name_prefix = "vm-%s"
-    admin_username = "myadmin"
-    admin_password = "Passwword1234"
-  }
-
-  network_profile {
-      name = "TestNetworkProfile-%d"
-      primary = true
-      ip_configuration {
-        name = "TestIPConfiguration"
-        subnet_id = "${azurerm_subnet.test.id}"
-      }
-  }
-
-  storage_profile_os_disk {
-     name = "osDiskProfile"
-     caching       = "ReadWrite"
-     create_option = "FromImage"
-     vhd_containers = ["${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}"]
-  }
-
-  storage_profile_image_reference {
-     publisher = "MicrosoftWindowsServer"
-     offer = "WindowsServer"
-     sku = "2012-R2-Datacenter"
-     version = "4.0.20160518"
-  }
-}
-`