diff --git a/.circleci/config.yml b/.circleci/config.yml
index c420ebc2b6ed26..f2f27c8d5e4ae2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,7 +54,7 @@ jobs:
           /tmp/julia/bin/julia-debug --sysimage-native-code=no -e 'true' &&
           pushd /tmp/julia/share/julia/test &&
           /tmp/julia/bin/julia --check-bounds=yes runtests.jl all --skip socket | bar -i 30 &&
-          /tmp/julia/bin/julia --check-bounds=yes runtests.jl libgit2-online download &&
+          /tmp/julia/bin/julia --check-bounds=yes runtests.jl libgit2-online Pkg download &&
           popd &&
           mkdir /tmp/embedding-test &&
           make check -C /tmp/julia/share/doc/julia/examples/embedding \
diff --git a/.freebsdci.sh b/.freebsdci.sh
index 3a030150949ad3..86192ac950ff49 100755
--- a/.freebsdci.sh
+++ b/.freebsdci.sh
@@ -38,7 +38,7 @@ runtests(){
 
     gmake testall \
         test-download \
-        test-pkg \
+        test-Pkg \
         test-libgit2-online
 }
 
diff --git a/.travis.yml b/.travis.yml
index 3f32e0ae01a314..af8898b3539c2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -144,7 +144,7 @@ script:
     - /tmp/julia/bin/julia -e 'versioninfo()'
     - pushd /tmp/julia/share/julia/test
     - /tmp/julia/bin/julia --check-bounds=yes runtests.jl $TESTSTORUN &&
-      /tmp/julia/bin/julia --check-bounds=yes runtests.jl libgit2-online download
+      /tmp/julia/bin/julia --check-bounds=yes runtests.jl libgit2-online Pkg download
     - popd
     # test that the embedding code works on our installation
     - mkdir /tmp/embedding-test &&
diff --git a/appveyor.yml b/appveyor.yml
index ff981f7f7d6f6e..8cebd7938bc0f4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,7 +54,7 @@ build_script:
 test_script:
   - usr\bin\julia -e "versioninfo()"
   - usr\bin\julia --sysimage-native-code=no -e "true"
-  - cd julia-* && .\bin\julia.exe --check-bounds=yes share\julia\test\runtests.jl all &&
+  - cd julia-* && .\bin\julia.exe --check-bounds=yes share\julia\test\runtests.jl Pkg all &&
       .\bin\julia.exe --check-bounds=yes share\julia\test\runtests.jl libgit2-online download
   - cd ..
   - usr\bin\julia usr\share\doc\julia\examples\embedding\embedding-test.jl examples\embedding\embedding.exe
diff --git a/stdlib/InteractiveUtils/src/InteractiveUtils.jl b/stdlib/InteractiveUtils/src/InteractiveUtils.jl
index 6e116b2d2047e9..aceebe84bac7a6 100644
--- a/stdlib/InteractiveUtils/src/InteractiveUtils.jl
+++ b/stdlib/InteractiveUtils/src/InteractiveUtils.jl
@@ -14,6 +14,7 @@ using Base: unwrap_unionall, rewrap_unionall, isdeprecated, Bottom, show_expr_ty
     to_tuple_type, signature_type, format_bytes
 
 using Markdown
+import Pkg
 
 include("editless.jl")
 include("codeview.jl")
diff --git a/stdlib/Pkg/src/Pkg.jl b/stdlib/Pkg/src/Pkg.jl
index 1c061e987e9e49..8bf1a48a8393ad 100644
--- a/stdlib/Pkg/src/Pkg.jl
+++ b/stdlib/Pkg/src/Pkg.jl
@@ -85,8 +85,6 @@ custom METADATA setup.
 init(meta::AbstractString=DEFAULT_META, branch::AbstractString=META_BRANCH) = Dir.init(meta,branch)
 
 function __init__()
-    Base.PKG_MODULE_REF[] = Pkg
-
     vers = "v$(VERSION.major).$(VERSION.minor)"
     pushfirst!(Base.LOAD_PATH, dir)
     pushfirst!(Base.LOAD_CACHE_PATH, abspath(Dir._pkgroot(), "lib", vers))
diff --git a/test/choosetests.jl b/test/choosetests.jl
index 2e84f6b1df7ad3..9d09c1b1559223 100644
--- a/test/choosetests.jl
+++ b/test/choosetests.jl
@@ -4,6 +4,8 @@ using Random
 
 const STDLIB_DIR = joinpath(Sys.BINDIR, "..", "share", "julia", "site", "v$(VERSION.major).$(VERSION.minor)")
 const STDLIBS = readdir(STDLIB_DIR)
+# Pkg tests are run separately
+filter!(x -> x != "Pkg", STDLIBS)
 
 @doc """
 
@@ -157,7 +159,7 @@ function choosetests(choices = [])
         filter!(x -> (x != "Profile"), tests)
     end
 
-    net_required_for = ["socket", "stdlib", "libgit2", "Pkg"]
+    net_required_for = ["socket", "libgit2"]
     net_on = true
     try
         ipa = getipaddr()