diff --git a/bindep.txt b/bindep.txt
index 4a6fb10d..6b31dd85 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -41,5 +41,4 @@ pyOpenSSL                   [platform:rpm]
 python-ndg_httpsclient      [platform:rpm]
 
 # Required for compressing collected log files in CI
-gzip              [platform:dpkg]
-gzip              [platform:rpm]
+gzip
diff --git a/tox.ini b/tox.ini
index 1ab4489c..27cef8e9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,6 +27,7 @@ whitelist_externals =
     wget
 setenv =
     VIRTUAL_ENV={envdir}
+    PYTHONUNBUFFERED=1
 
 
 [testenv:docs]
@@ -186,7 +187,8 @@ commands =
                      && (echo "Idempotence test: pass" && exit 0) \
                      || (echo "Idempotence test: fail" && exit 1)'
     bash -c 'mkdir -p {toxinidir}/logs'
-    bash -c 'rsync -av --ignore-errors /var/log/ /openstack/log/ {toxinidir}/logs/ || true'
+    bash -c 'rsync --archive --verbose --ignore-errors /var/log/ /openstack/log/ {toxinidir}/logs/ || true'
+    bash -c 'find "{toxinidir}/logs/" -type f | sed "p;s|$|.txt|" | xargs -n2 mv'
     bash -c '$(which gzip) --best --recursive "{toxinidir}/logs/"'