diff --git a/functions.sh b/functions.sh
index 08956741..eba6e6c2 100644
--- a/functions.sh
+++ b/functions.sh
@@ -874,9 +874,14 @@ function cleanup_host {
 
     sudo iptables-save > $WORKSPACE/iptables.txt
     df -h > $WORKSPACE/df.txt
-    pip freeze > $WORKSPACE/pip-freeze.txt
-    sudo mv $WORKSPACE/iptables.txt $WORKSPACE/df.txt \
-        $WORKSPACE/pip-freeze.txt $BASE/logs/
+    sudo mv $WORKSPACE/iptables.txt $WORKSPACE/df.txt $BASE/logs/
+
+    for py_ver in 2 3; do
+        if [[ `which python${py_ver}` ]]; then
+            python${py_ver} -m pip freeze > $WORKSPACE/pip${py_ver}-freeze.txt
+            sudo mv $WORKSPACE/pip${py_ver}-freeze.txt $BASE/logs/
+        fi
+    done
 
     if [ `command -v dpkg` ]; then
         dpkg -l> $WORKSPACE/dpkg-l.txt