diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index 7312f75d2da..cd6f1fac9c8 100644
--- a/src/Modules/PSGalleryModules.csproj
+++ b/src/Modules/PSGalleryModules.csproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <PackageReference Include="PackageManagement" Version="1.1.7.2" />
-    <PackageReference Include="PowerShellGet" Version="1.6.7" />
+    <PackageReference Include="PowerShellGet" Version="2.0.0" />
     <PackageReference Include="Microsoft.PowerShell.Archive" Version="1.1.0.0" />
     <PackageReference Include="PSReadLine" Version="2.0.0-beta3" />
     <PackageReference Include="ThreadJob" Version="1.1.2" />
diff --git a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
index 925363251bc..48e5bbea370 100644
--- a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
+++ b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
@@ -5,7 +5,7 @@
 $ProgressPreference = "SilentlyContinue"
 
 $RepositoryName = 'INTGallery'
-$SourceLocation = 'https://dtlgalleryint.cloudapp.net'
+$SourceLocation = 'https://www.poshtestgallery.com'
 $RegisteredINTRepo = $false
 $ContosoServer = 'ContosoServer'
 $FabrikamServerScript = 'Fabrikam-ServerScript'
@@ -127,8 +127,8 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
         $psgetModuleInfo.Repository | Should -Be $RepositoryName
     }
 
-    It "Should install a module correctly to the required location with CurrentUser scope" {
-        Install-Module -Name $ContosoServer -Repository $RepositoryName -Scope CurrentUser
+    It "Should install a module correctly to the required location with default CurrentUser scope" {
+        Install-Module -Name $ContosoServer -Repository $RepositoryName
         $installedModuleInfo = Get-InstalledModule -Name $ContosoServer
 
         $installedModuleInfo | Should -Not -BeNullOrEmpty
@@ -159,8 +159,8 @@ Describe "PowerShellGet - Module tests (Admin)" -tags @('Feature', 'RequireAdmin
     }
 
     ## Marked as 'Pending' on Linux for now because the test requires root privilege but we cannot do it now in our Travis CI Linux build
-    It "Should install a module correctly to the required location with default AllUsers scope" -Pending:$IsLinux {
-        Install-Module -Name $ContosoServer -Repository $RepositoryName
+    It "Should install a module correctly to the required location with AllUsers scope" -Pending:$IsLinux {
+        Install-Module -Name $ContosoServer -Repository $RepositoryName -Scope AllUsers
         $installedModuleInfo = Get-InstalledModule -Name $ContosoServer
 
         $installedModuleInfo | Should -Not -BeNullOrEmpty
@@ -201,8 +201,8 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
         $psgetScriptInfo.Repository | Should -Be $RepositoryName
     }
 
-    It "Should install a script correctly to the required location with CurrentUser scope" {
-        Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -Scope CurrentUser -NoPathUpdate
+    It "Should install a script correctly to the required location with default CurrentUser scope" {
+        Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -NoPathUpdate
         $installedScriptInfo = Get-InstalledScript -Name $FabrikamServerScript
 
         $installedScriptInfo | Should -Not -BeNullOrEmpty
@@ -229,8 +229,8 @@ Describe "PowerShellGet - Script tests (Admin)" -tags @('Feature', 'RequireAdmin
     }
 
     ## Marked as 'Pending' on Linux for now because the test requires root privilege but we cannot do it now in our Travis CI Linux build
-    It "Should install a script correctly to the required location with default AllUsers scope" -Pending:$IsLinux {
-        Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -NoPathUpdate
+    It "Should install a script correctly to the required location with AllUsers scope" -Pending:$IsLinux {
+        Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -NoPathUpdate -Scope AllUsers
         $installedScriptInfo = Get-InstalledScript -Name $FabrikamServerScript
 
         $installedScriptInfo | Should -Not -BeNullOrEmpty