diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1eba2a5..03f77bf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -95,7 +95,7 @@ jobs:
                 name: Run plugin tests
                 command: |
                     .circleci/integration-test.py run-test \
-                        --installer-args "--plugin /srv/src/integration-tests/plugins/simplest" \
+                        --installer-args "--plugin /srv/src/plugins/simplest" \
                         plugins test_simplest_plugin.py
 
             - run:
diff --git a/.circleci/integration-test.py b/.circleci/integration-test.py
index 85d66ec..1039d45 100755
--- a/.circleci/integration-test.py
+++ b/.circleci/integration-test.py
@@ -85,19 +85,20 @@ def run_test(image_name, test_name, test_files, installer_args):
         os.path.join(os.path.dirname(__file__), os.pardir)
     )
 
-    copy_to_container(test_name, source_path, '/srv/src')
+    copy_to_container(test_name, os.path.join(source_path, 'bootstrap/'), '/srv/src')
     run_container_command(
         test_name,
-        f'python3 /srv/src/bootstrap/bootstrap.py {installer_args}'
+        f'python3 /srv/src/bootstrap.py {installer_args}'
     )
+    copy_to_container(test_name, os.path.join(source_path, 'integration-tests/'), '/srv/src')
     run_container_command(
         test_name,
-        'python3 -m pip install -r /srv/src/integration-tests/requirements.txt'
+        'python3 -m pip install -r /srv/src/requirements.txt'
     )
     run_container_command(
         test_name,
         'python3 -m pytest -v {}'.format(
-            ' '.join([os.path.join('/srv/src/integration-tests/', f) for f in test_files])
+            ' '.join([os.path.join('/srv/src/', f) for f in test_files])
         )
     )
 
diff --git a/integration-tests/Dockerfile b/integration-tests/Dockerfile
index 00c6ac1..5eda6c8 100644
--- a/integration-tests/Dockerfile
+++ b/integration-tests/Dockerfile
@@ -23,6 +23,6 @@ STOPSIGNAL SIGRTMIN+3
 # Set up image to be useful out of the box for development & CI
 #ENV TLJH_BOOTSTRAP_DEV=yes
 #ENV TLJH_BOOTSTRAP_PIP_SPEC=/srv/src
-ENV PATH=/opt/tljh/hub/bin:${PATH}
+#ENV PATH=/opt/tljh/hub/bin:${PATH}
 
 CMD ["/bin/bash", "-c", "exec /sbin/init --log-target=journal 3>&1"]