diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c783176..35510fa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,10 +33,6 @@ jobs:
           sudo apt-get install -y libsasl2-dev
           make install
 
-          # Note: currently required to import snapshot utils from localstack
-          # TODO remove once imports are better organized in localstack
-          . .venv/bin/activate; pip install localstack-core[runtime]
-
       - name: Run tests
         run: |
           make lint
diff --git a/Makefile b/Makefile
index ca7a0ba..976e90f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ install:           ## Install dependencies in local virtualenv folder
 
 publish:           ## Publish the library to the central PyPi repository
 	# build and upload archive
+	$(VENV_RUN); $(PIP_CMD) install twine
 	$(VENV_RUN); ./setup.py sdist && twine upload $(BUILD_DIR)/*.tar.gz
 
 test:              ## Run automated tests
diff --git a/setup.py b/setup.py
index 2af65c8..b8cc254 100755
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,7 @@
         "flake8",
         "flake8-black",
         "flake8-isort",
+        "localstack-core[runtime]",
         "pytest",
         "pytest-httpserver",
         "localstack-snapshot",