diff --git a/linux_docker_resources/Dockerfile b/linux_docker_resources/Dockerfile
index cf7d4ce1a..817abb9aa 100644
--- a/linux_docker_resources/Dockerfile
+++ b/linux_docker_resources/Dockerfile
@@ -35,7 +35,7 @@ RUN if test ${PLATFORM} = x86; then curl --silent https://packagecloud.io/gpg.ke
 RUN apt-get update && apt-get install -y build-essential ccache cmake pkg-config python3-empy python3-setuptools python3-vcstool
 
 # Install build and test dependencies of ROS 2 packages.
-RUN apt-get update && apt-get install -y clang-format-3.8 cppcheck git pydocstyle pyflakes python3-coverage python3-mock python3-nose python3-pep8 uncrustify
+RUN apt-get update && apt-get install -y clang-format-3.8 cppcheck git pydocstyle pyflakes python3-coverage python3-flake8 python3-mock python3-nose python3-pep8 uncrustify
 
 # Install and self update pip/setuptools to the latest version.
 RUN apt-get update && apt-get install -y python3-pip
diff --git a/ros2_batch_job/__main__.py b/ros2_batch_job/__main__.py
index 449ec4851..e1b85761e 100644
--- a/ros2_batch_job/__main__.py
+++ b/ros2_batch_job/__main__.py
@@ -45,14 +45,15 @@
 sys.stderr = UnbufferedIO(sys.stderr)
 
 pip_dependencies = [
+    'EmPy',
+    'coverage',
+    'flake8',
+    'flake8-import-order',
+    'mock',
     'nose',
     'pep8',
     'pydocstyle',
     'pyflakes',
-    'flake8',
-    'mock',
-    'coverage',
-    'EmPy',
     'vcstool',
 ]
 
@@ -382,6 +383,8 @@ def run(args, build_function, blacklisted_package_names=None):
         job.run(['"%s"' % job.python, '-m', 'pip', '--version'], shell=True)
         # Install pip dependencies
         job.run(['"%s"' % job.python, '-m', 'pip', 'install', '-U'] + pip_dependencies, shell=True)
+        # Show what pip has
+        job.run(['"%s"' % job.python, '-m', 'pip', 'freeze'], shell=True)
         print('# END SUBSECTION')
 
         # Skip git operations on arm because git doesn't work in qemu. Assume