diff --git a/src/Network/Network.Test/ScenarioTests/HubBgpConnectionTests.cs b/src/Network/Network.Test/ScenarioTests/HubBgpConnectionTests.cs
deleted file mode 100644
index fb207551d1c6..000000000000
--- a/src/Network/Network.Test/ScenarioTests/HubBgpConnectionTests.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Microsoft.Azure.Commands.Network.Test.ScenarioTests;
-using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Xunit;
-
-namespace Commands.Network.Test.ScenarioTests
-{
-    public class HubBgpConnectionTests : NetworkTestRunner
-    {
-        public HubBgpConnectionTests(Xunit.Abstractions.ITestOutputHelper output)
-            : base(output)
-        {
-        }
-
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.pgtm)]
-        public void TestHubBgpConnectionCRUDMinimalParameters()
-        {
-            TestRunner.RunTestScript(string.Format("Test-HubBgpConnectionCRUD"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Network/Network.Test/ScenarioTests/HubBgpConnectionTests.ps1 b/src/Network/Network.Test/ScenarioTests/HubBgpConnectionTests.ps1
deleted file mode 100644
index 1dee93f19fd1..000000000000
--- a/src/Network/Network.Test/ScenarioTests/HubBgpConnectionTests.ps1
+++ /dev/null
@@ -1,80 +0,0 @@
-# ----------------------------------------------------------------------------------
-#
-# Copyright Microsoft Corporation
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ----------------------------------------------------------------------------------
-
-function Check-CmdletReturnType
-{
-    param($cmdletName, $cmdletReturn)
-
-    $cmdletData = Get-Command $cmdletName
-    Assert-NotNull $cmdletData
-    [array]$cmdletReturnTypes = $cmdletData.OutputType.Name | Foreach-Object { return ($_ -replace "Microsoft.Azure.Commands.Network.Models.","") }
-    [array]$cmdletReturnTypes = $cmdletReturnTypes | Foreach-Object { return ($_ -replace "System.","") }
-    $realReturnType = $cmdletReturn.GetType().Name -replace "Microsoft.Azure.Commands.Network.Models.",""
-    return $cmdletReturnTypes -contains $realReturnType
-}
-
-<#
-.SYNOPSIS
-Test creating new HubBgpConnection
-#>
-function Test-HubBgpConnectionCRUD
-{
-    # Setup
-    $rgname = Get-ResourceGroupName
-    $vnetName = Get-ResourceName
-    $rglocation = Get-ProviderLocation ResourceManagement "centraluseuap"
-    $virtualRouterName = Get-ResourceName
-    $virtualWanName = Get-ResourceName
-    $subnetName = Get-ResourceName
-    $peerName = Get-ResourceName
-
-    try
-    {
-      # Create resource group
-      $resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" } 
-     
-      # Create virtual network and subnet
-      $subnet = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.0.0/24
-      $vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $rglocation -AddressPrefix 10.0.0.0/16 -Subnet $subnet
-      $vnet = Get-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname
-      $hostedSubnet = Get-AzVirtualNetworkSubnetConfig -Name $subnetName -VirtualNetwork $vnet
-      
-      # Create virtual router
-      $virtualRouter = New-AzVirtualRouter -ResourceGroupName $rgname -location $rglocation -Name $virtualRouterName -HostedSubnet $hostedsubnet.Id
-      $virtualRouter = Get-AzVirtualRouter -ResourceGroupName $rgname -RouterName $virtualRouterName
-
-      # Create hub bgp connection
-      $actualBgpConnection = Add-AzVirtualRouterPeer -ResourceGroupName $rgname -VirtualRouterName $virtualRouterName -PeerName $peerName -PeerIp "192.168.1.5" -PeerAsn "20000"
-      $expectedBgpConnection = Get-AzVirtualRouterPeer -ResourceGroupName $rgname -VirtualRouterName $virtualRouterName -PeerName $peerName
-      Assert-AreEqual $expectedBgpConnection.Peerings.PeerName $actualBgpConnection.PeerName
-      Assert-AreEqual $expectedBgpConnection.PeerIp "192.168.1.5"
-      Assert-AreEqual $expectedBgpConnection.PeerAsn "20000"
-
-      #delete hub bgp connection
-      $deleteBgpConnection = Remove-AzVirtualRouterPeer -ResourceGroupName $rgname -VirtualRouterName $virtualRouterName -PeerName $peerName -Force
-      Assert-AreEqual 0 @($deleteBgpConnection.Peerings).Count
-
-      # Delete virtual router
-      $deleteVirtualRouter = Remove-AzVirtualRouter -ResourceGroupName $rgname -RouterName $virtualRouterName -PassThru -Force
-      Assert-AreEqual true $deleteVirtualRouter
-
-      $list = Get-AzVirtualRouter -ResourceGroupName $rgname
-      Assert-AreEqual 0 @($list).Count
-    }
-    finally
-    {
-        # Cleanup
-        Clean-ResourceGroup $rgname
-    }
-}
diff --git a/src/Network/Network.Test/ScenarioTests/VirtualRouterTests.cs b/src/Network/Network.Test/ScenarioTests/VirtualRouterTests.cs
index d8b4c93ca38e..bca79d5c13c6 100644
--- a/src/Network/Network.Test/ScenarioTests/VirtualRouterTests.cs
+++ b/src/Network/Network.Test/ScenarioTests/VirtualRouterTests.cs
@@ -32,5 +32,13 @@ public void TestVirtualRouterCRUDMinimalParameters()
         {
             TestRunner.RunTestScript(string.Format("Test-VirtualRouterCRUD"));
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.pgtm)]
+        public void TestVirtualRouterPeerCRUD()
+        {
+            TestRunner.RunTestScript(string.Format("Test-VirtualRouterPeerCRUD"));
+        }
     }
 }
diff --git a/src/Network/Network.Test/ScenarioTests/VirtualRouterTests.ps1 b/src/Network/Network.Test/ScenarioTests/VirtualRouterTests.ps1
index af5cf2b8bd62..8d126b6edfa7 100644
--- a/src/Network/Network.Test/ScenarioTests/VirtualRouterTests.ps1
+++ b/src/Network/Network.Test/ScenarioTests/VirtualRouterTests.ps1
@@ -75,3 +75,58 @@ function Test-VirtualRouterCRUD
         Clean-ResourceGroup $rgname
     }
 }
+
+<#
+.SYNOPSIS
+Test creating new virtualRouterPeer
+#>
+function Test-VirtualRouterPeerCRUD
+{
+    # Setup
+    $rgname = Get-ResourceGroupName
+    $vnetName = Get-ResourceName
+    $rglocation = Get-ProviderLocation ResourceManagement "centraluseuap"
+    $virtualRouterName = Get-ResourceName
+    $virtualWanName = Get-ResourceName
+    $subnetName = Get-ResourceName
+    $peerName = Get-ResourceName
+
+    try
+    {
+      # Create resource group
+      $resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" } 
+     
+      # Create virtual network and subnet
+      $subnet = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.0.0/24
+      $vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $rglocation -AddressPrefix 10.0.0.0/16 -Subnet $subnet
+      $vnet = Get-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname
+      $hostedSubnet = Get-AzVirtualNetworkSubnetConfig -Name $subnetName -VirtualNetwork $vnet
+      
+      # Create virtual router
+      $virtualRouter = New-AzVirtualRouter -ResourceGroupName $rgname -location $rglocation -Name $virtualRouterName -HostedSubnet $hostedsubnet.Id
+      $virtualRouter = Get-AzVirtualRouter -ResourceGroupName $rgname -RouterName $virtualRouterName
+
+      # Create hub bgp connection
+      $actualBgpConnection = Add-AzVirtualRouterPeer -ResourceGroupName $rgname -VirtualRouterName $virtualRouterName -PeerName $peerName -PeerIp "192.168.1.5" -PeerAsn "20000"
+      $expectedBgpConnection = Get-AzVirtualRouterPeer -ResourceGroupName $rgname -VirtualRouterName $virtualRouterName -PeerName $peerName
+      Assert-AreEqual $expectedBgpConnection.Peerings.PeerName $actualBgpConnection.PeerName
+      Assert-AreEqual $expectedBgpConnection.PeerIp "192.168.1.5"
+      Assert-AreEqual $expectedBgpConnection.PeerAsn "20000"
+
+      #delete hub bgp connection
+      $deleteBgpConnection = Remove-AzVirtualRouterPeer -ResourceGroupName $rgname -VirtualRouterName $virtualRouterName -PeerName $peerName -Force
+      Assert-AreEqual 0 @($deleteBgpConnection.Peerings).Count
+
+      # Delete virtual router
+      $deleteVirtualRouter = Remove-AzVirtualRouter -ResourceGroupName $rgname -RouterName $virtualRouterName -PassThru -Force
+      Assert-AreEqual true $deleteVirtualRouter
+
+      $list = Get-AzVirtualRouter -ResourceGroupName $rgname
+      Assert-AreEqual 0 @($list).Count
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
\ No newline at end of file
diff --git a/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.HubBgpConnectionTests/TestHubBgpConnectionCRUDMinimalParameters.json b/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualRouterTests/TestVirtualRouterPeerCRUD.json
similarity index 99%
rename from src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.HubBgpConnectionTests/TestHubBgpConnectionCRUDMinimalParameters.json
rename to src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualRouterTests/TestVirtualRouterPeerCRUD.json
index e721227eb7cb..e6136b27bdb2 100644
--- a/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.HubBgpConnectionTests/TestHubBgpConnectionCRUDMinimalParameters.json
+++ b/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualRouterTests/TestVirtualRouterPeerCRUD.json
@@ -4478,7 +4478,7 @@
     }
   ],
   "Names": {
-    "Test-HubBgpConnectionCRUD": [
+    "Test-VirtualRouterPeerCRUD": [
       "ps3045",
       "ps5215",
       "ps2813",
@@ -4490,4 +4490,4 @@
   "Variables": {
     "SubscriptionId": "8c992d64-fce9-426d-b278-85642dfeab03"
   }
-}
\ No newline at end of file
+}