diff --git a/bindep.txt b/bindep.txt
index 931e963d..fe589259 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -36,3 +36,6 @@ python-ndg-httpsclient      [platform:ubuntu !platform:ubuntu-trusty]
 python2-pyasn1              [platform:rpm]
 pyOpenSSL                   [platform:rpm]
 python-ndg_httpsclient      [platform:rpm]
+
+# Required for compressing collected log files in CI
+gzip
diff --git a/tox.ini b/tox.ini
index c0b86582..622d0b89 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,6 +27,7 @@ whitelist_externals =
     wget
 setenv =
     VIRTUAL_ENV={envdir}
+    PYTHONUNBUFFERED=1
 
 
 [testenv:docs]
@@ -155,10 +156,17 @@ commands =
 install_command =
     pip install -U --force-reinstall {opts} {packages}
 
+[testenv:func_logs]
+commands =
+    bash -c 'mkdir -p {toxinidir}/logs'
+    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 'command gzip --best --recursive "{toxinidir}/logs/"'
+
 
 [testenv:functional]
 # Ignore_errors is set to true so that the logs are collected at the
-#  end of the run. This will not produce a failse positive. Any
+#  end of the run. This will not produce a false positive. Any
 #  exception will be mark the run as "failed" and exit 1 after all of
 #  the commands have been iterated through.
 ignore_errors = True
@@ -175,13 +183,12 @@ commands =
                      -e @{toxinidir}/tests/keystone-overrides.yml \
                      -e "keystone_rolename={toxinidir}" \
                      {toxinidir}/tests/test.yml -vvvv
-    bash -c 'mkdir -p {toxinidir}/logs'
-    bash -c 'rsync -av --ignore-errors /var/log/ /openstack/log/ {toxinidir}/logs/ || true'
+    {[testenv:func_logs]commands}
 
 
 [testenv:uwsgi_apache]
 # Ignore_errors is set to true so that the logs are collected at the
-#  end of the run. This will not produce a failse positive. Any
+#  end of the run. This will not produce a false positive. Any
 #  exception will be mark the run as "failed" and exit 1 after all of
 #  the commands have been iterated through.
 ignore_errors = True
@@ -199,13 +206,12 @@ commands =
                      -e "keystone_rolename={toxinidir}" \
                      -e "keystone_mod_wsgi_enabled=False" \
                      {toxinidir}/tests/test.yml -vvvv
-    bash -c 'mkdir -p {toxinidir}/logs'
-    bash -c 'rsync -av --ignore-errors /var/log/ /openstack/log/ {toxinidir}/logs/ || true'
+    {[testenv:func_logs]commands}
 
 
 [testenv:uwsgi_nginx]
 # Ignore_errors is set to true so that the logs are collected at the
-#  end of the run. This will not produce a failse positive. Any
+#  end of the run. This will not produce a false positive. Any
 #  exception will be mark the run as "failed" and exit 1 after all of
 #  the commands have been iterated through.
 ignore_errors = True
@@ -224,8 +230,7 @@ commands =
                      -e "keystone_apache_enabled=False" \
                      -e "keystone_mod_wsgi_enabled=False" \
                      {toxinidir}/tests/test.yml -vvvv
-    bash -c 'mkdir -p {toxinidir}/logs'
-    bash -c 'rsync -av --ignore-errors /var/log/ /openstack/log/ {toxinidir}/logs/ || true'
+    {[testenv:func_logs]commands}
 
 
 [testenv:linters]