diff --git a/.circleci/config.yml b/.circleci/config.yml
index be13b15..60f8412 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -65,12 +65,12 @@ jobs:
             - run:
                 name: build systemd image
                 command: |
-                    python3 .circleci/integration-test.py build-image
+                    .circleci/integration-test.py build-image
 
             - run:
-                name: Run hub tests
+                name: Run basic tests tests
                 command: |
-                    python3 .circleci/integration-test.py run-test test_hub.py
+                    .circleci/integration-test.py run-test basic-tests test_hub.py test_install.py test_extensions.py
 
 
 
diff --git a/.circleci/integration-test.py b/.circleci/integration-test.py
index b72220f..fbd1272 100755
--- a/.circleci/integration-test.py
+++ b/.circleci/integration-test.py
@@ -120,6 +120,7 @@ def main():
     argparser = argparse.ArgumentParser()
     subparsers = argparser.add_subparsers(dest='action')
 
+    subparsers.add_parser('build-image')
     subparsers.add_parser('stop-container').add_argument(
         'container_name'
     )
@@ -152,6 +153,8 @@ def main():
         copy_to_container(args.container_name, args.src, args.dest)
     elif args.action == 'stop-container':
         stop_container(args.container_name)
+    elif args.action == 'build-image':
+        build_systemd_image(image_name, 'integration-tests')
 
 
 if __name__ == '__main__':