diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 0b7069ab67d..240fe638834 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -36,7 +36,7 @@ in buildPythonPackage rec {
     six
   ];
 
-  # Tests are in <nixpkgs/nixos/tests/blivet.nix>.
+  # Tests are in nixos/tests/blivet.nix.
   doCheck = false;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/statsd/default.nix b/pkgs/tools/networking/statsd/default.nix
index 1143d55269f..6f909a915ae 100644
--- a/pkgs/tools/networking/statsd/default.nix
+++ b/pkgs/tools/networking/statsd/default.nix
@@ -3,7 +3,7 @@
 
 let
   self = recurseIntoAttrs (
-    callPackage <nixpkgs/pkgs/top-level/node-packages.nix> {
+    callPackage ../../../top-level/node-packages.nix {
       inherit nodejs self;
       generated = callPackage ./node-packages.nix { inherit self; };
       overrides = {
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 341e9ec81d6..fdd8fb0ef7d 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -30,12 +30,21 @@ releaseTools.sourceTarball rec {
   checkPhase = ''
     export NIX_DB_DIR=$TMPDIR
     export NIX_STATE_DIR=$TMPDIR
+    export NIX_PATH=nixpkgs=$TMPDIR/barf.nix
     nix-store --init
 
+    echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix
+
+    # Make sure that Nixpkgs does not use <nixpkgs>
+    if grep -r '<nixpkgs\/' pkgs; then
+        echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself."
+        exit 1
+    fi
+
     # Make sure that derivation paths do not depend on the Nixpkgs path.
     mkdir $TMPDIR/foo
     ln -s $(readlink -f .) $TMPDIR/foo/bar
-    p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox)
+    p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox --show-trace)
     p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox)
     if [ "$p1" != "$p2" ]; then
         echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!"
@@ -51,19 +60,19 @@ releaseTools.sourceTarball rec {
 
     # Check that all-packages.nix evaluates on a number of platforms without any warnings.
     for platform in i686-linux x86_64-linux x86_64-darwin; do
-        header "checking pkgs/top-level/all-packages.nix on $platform"
+        header "checking Nixpkgs on $platform"
 
-        NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \
+        NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \
             --show-trace --argstr system "$platform" \
             -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log
 
         if [ -s eval-warnings.log ]; then
-            echo "pkgs/top-level/all-packages.nix on $platform evaluated with warnings, aborting"
+            echo "Nixpkgs on $platform evaluated with warnings, aborting"
             exit 1
         fi
         rm eval-warnings.log
 
-        NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \
+        NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \
             --show-trace --argstr system "$platform" \
             -qa --drv-path --system-filter \* --system --meta --xml > /dev/null
         stopNest