diff --git a/Makefile b/Makefile
index bd51deb5..5002c532 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ bandit:
 build-client: lint-client
 	cd fittrackee_client && $(NPM) build
 
-check-all: lint-all type-check test-all
+check-all: bandit lint-all type-check test-all
 
 check-client: lint-client test-client
 
diff --git a/fittrackee/config.py b/fittrackee/config.py
index 3618f54b..8f5bcda6 100644
--- a/fittrackee/config.py
+++ b/fittrackee/config.py
@@ -65,7 +65,6 @@ class TestingConfig(BaseConfig):
     TOKEN_EXPIRATION_DAYS = 0
     TOKEN_EXPIRATION_SECONDS = 3
     PASSWORD_TOKEN_EXPIRATION_SECONDS = 3
-    UPLOAD_FOLDER = '/tmp/FitTrackee/uploads'  # nosec
     UI_URL = 'http://0.0.0.0:5000'
     SENDER_EMAIL = 'fittrackee@example.com'
 
diff --git a/fittrackee/tests/conftest.py b/fittrackee/tests/conftest.py
index 9914ebd5..2b643709 100644
--- a/fittrackee/tests/conftest.py
+++ b/fittrackee/tests/conftest.py
@@ -7,6 +7,9 @@ os.environ['FLASK_ENV'] = 'testing'
 os.environ['APP_SETTINGS'] = 'fittrackee.config.TestingConfig'
 # to avoid resetting dev database during tests
 os.environ['DATABASE_URL'] = os.environ['DATABASE_TEST_URL']
+TEMP_FOLDER = '/tmp/FitTrackee'
+os.environ['UPLOAD_FOLDER'] = TEMP_FOLDER
+os.environ['APP_LOG'] = TEMP_FOLDER + '/fittrackee.log'
 
 pytest_plugins = [
     'fittrackee.tests.fixtures.fixtures_app',