diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.cs b/src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.cs
index dd3202eb7114..50a9b946e131 100644
--- a/src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.cs
+++ b/src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.cs
@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.Profile.Test
 {
     public class ProfileModuleTests
     {
-        [Fact]
+        [Fact(Skip="Removed flaky test from CI.")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void WarningOnIncompatibleVersions()
         {
diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.ps1 b/src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.ps1
index 8dc26becc6e9..e70346594e39 100644
--- a/src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.ps1
+++ b/src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.ps1
@@ -12,12 +12,25 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
+function Verify-TestRepoDeleted
+{
+    $createdRepo = Get-PSRepository -Name "ProfileModuleTest" -ErrorAction Ignore
+    if($createdRepo)
+    {
+        Unregister-PSRepository -Name "ProfileModuleTest"
+    }
+}
+
 <#
 .SYNOPSIS
 Tests warning gets printed on incompatible modules with profile
 #>
 function Test-LoadProfileModule
 {
+    $testPassed = $false
+    # Clean environment
+    Verify-TestRepoDeleted
+
     # Push current profile module
     Get-PackageProvider -Name NuGet -ForceBootstrap
     $global:pushedProfileModule = $(Get-Module AzureRM.Profile).Path 
@@ -29,15 +42,17 @@ function Test-LoadProfileModule
             $global:buffer = Import-Module $global:pushedProfileModule 2>&1 3>&1 | Out-String
             Write-Warning $global:buffer
             Assert-True { $global:buffer -Like "*AzureRM.ApiManagement 998.9.8 is not compatible with AzureRM.Profile*" }
+            $testPassed = $true
         } catch [system.exception] {
-            Write-Error $_ -ErrorAction Continue
+            Write-Error $_
         } finally {
             Uninstall-Module AzureRM.ApiManagement -ErrorAction Ignore
             Uninstall-Module AzureRM.Profile -ErrorAction Ignore
         }
     } catch [system.exception] {
-        Write-Error $_ -ErrorAction Continue
+        Write-Error $_
     } finally {
-        Unregister-PSRepository -Name "ProfileModuleTest"
+        Verify-TestRepoDeleted
     }
+    Assert-True { $testPassed -eq $true } "testPassed = $testPassed"
 }
\ No newline at end of file