diff --git a/README.md b/README.md
index f1437a8..dcc8069 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,11 @@ Vigil maintains an up-to-date set of reports for every file in a codebase.
     # git clone https://github.com/ahamilton/vigil
     # cd vigil
     # ./install-dependencies
-    # sudo python3 setup.py install  (pip3 can be used here)
+    # pip3 install .
+
+To test its working properly:
+
+    # ./test-all
 
 then to run:
 
diff --git a/make-readme.py b/make-readme.py
index d41a238..65046ce 100755
--- a/make-readme.py
+++ b/make-readme.py
@@ -28,7 +28,11 @@ Vigil maintains an up-to-date set of reports for every file in a codebase.
     # git clone https://github.com/ahamilton/vigil
     # cd vigil
     # ./install-dependencies
-    # sudo python3 setup.py install  (pip3 can be used here)
+    # pip3 install .
+
+To test its working properly:
+
+    # ./test-all
 
 then to run:
 
diff --git a/test-distributions b/test-distributions
index cf2ec04..3d4a8a4 100755
--- a/test-distributions
+++ b/test-distributions
@@ -40,6 +40,7 @@ function build_ubuntu {
     run_in_container ubuntu.part \
 		     ln -sf /lib/systemd/resolv.conf /etc/resolv.conf
     run_in_container ubuntu.part apt-get update
+    run_in_container ubuntu.part apt-get install --yes python3-pip
     mv ubuntu.part ubuntu
 }
 
@@ -147,7 +148,8 @@ function remove_gentoo {
 [ $# -eq 0 ] && WORK_PATH=$(mktemp -d --suffix=-vigil) || WORK_PATH="$1"
 sudo apt-get install -y systemd-container debootstrap xz-utils wget
 cd $WORK_PATH
-for DISTRIBUTION in ubuntu fedora debian archlinux opensuse pixel gentoo; do
+# FIX: Reenable: fedora debian archlinux opensuse pixel gentoo
+for DISTRIBUTION in ubuntu; do
     if [ -e $DISTRIBUTION ]; then
 	echo "$DISTRIBUTION container already exists."
     else
@@ -157,9 +159,9 @@ for DISTRIBUTION in ubuntu fedora debian archlinux opensuse pixel gentoo; do
     echo "Installing vigil's dependencies in $DISTRIBUTION..."
     run_in_container $DISTRIBUTION ./install-dependencies
     echo "Installing vigil in $DISTRIBUTION..."
-    run_in_container $DISTRIBUTION sudo python3 setup.py install
-    echo "Testing executables are installed in $DISTRIBUTION..."
-    run_in_container $DISTRIBUTION ./tests/tools_test.py ExecutablesTestCase
+    run_in_container $DISTRIBUTION pip3 install .
+    echo "Testing vigil in $DISTRIBUTION..."
+    run_in_container $DISTRIBUTION ./test-all
     echo "Running vigil in $DISTRIBUTION..."
     run_in_container $DISTRIBUTION vigil --help
     echo "Successfully installed vigil in $DISTRIBUTION."