diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 564df37..3a7765d 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -81,6 +81,13 @@ jobs:
       run: |
         echo "${{ secrets.QUAY_PUSH_TOKEN }}" | docker login -u="${{ secrets.QUAY_PUSH_USERNAME }}" --password-stdin quay.io
 
+    - name: Build intermediary kiwitcms/kiwi image
+      if: matrix.command == 'test-docker-image'
+      run: |
+          git clone https://github.com/kiwitcms/Kiwi
+          make -C Kiwi/ docker-image
+          docker tag kiwitcms/kiwi:latest quay.io/kiwitcms/version:13.7
+
     - name: make ${{ matrix.command }}
       run: |
         make ${{ matrix.command }}
diff --git a/requirements.txt b/requirements.txt
index de7506f..c71d863 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ django-python3-ldap==0.15.8
 django-ses==4.3.1
 dj-database-url==2.3.0
 kiwitcms-github-app==2.0.1
-kiwitcms-tenants==3.2.2
+kiwitcms-tenants==4.0.0
 kiwitcms-trackers-integration==1.1.0
 sentry-sdk[django]==2.19.2
 social-auth-app-django==5.4.2
diff --git a/testing/test_upload_file.robot b/testing/test_upload_file.robot
index af73c81..ca6456b 100644
--- a/testing/test_upload_file.robot
+++ b/testing/test_upload_file.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Alexander Todorov <atodorov@otb.bg>
+# Copyright (c) 2024-2025 Alexander Todorov <atodorov@otb.bg>
 #
 # Licensed under GNU Affero General Public License v3 or later (AGPLv3+)
 # https://www.gnu.org/licenses/agpl-3.0.html
@@ -19,7 +19,7 @@ ${TEST_PLAN_URL}        ${SERVER}/plan/1/
 *** Test Cases ***
 Uploading file works via file upload
     Open Browser    ${LOGIN_URL}    ${BROWSER}
-    Maximize Browser Window
+    Set Window Size     3024    1890
     Set Selenium Speed    ${DELAY}
     Title Should Be    Kiwi TCMS - Login