diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt
index 3c15c44b696..1397f3afb2a 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt
@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2022 The Catrobat Team
+ * Copyright (C) 2010-2023 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -57,6 +57,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.Mockito
 import org.mockito.Mockito.spy
 import org.mockito.Mockito.verify
 
@@ -92,22 +93,16 @@ class ProjectUploadDialogTest {
             .putInt(NUMBER_OF_UPLOADED_PROJECTS, 1)
             .commit()
 
-        onView(withText(R.string.next))
-            .perform(click())
+        onView(withText(R.string.next)).perform(click())
         getInstrumentation().waitForIdleSync()
-
-        onView(withText(R.string.next))
-            .perform(click())
+        onView(withText(R.string.next)).perform(click())
         getInstrumentation().waitForIdleSync()
-
-        onView(withText(R.string.next))
-            .perform(click())
-
+        onView(withId(android.R.id.button1)).perform(click())
         val projectUploadController = activityTestRule.activity.projectUploadController()
 
-        Looper.prepare()
-        verify(projectUploadController)?.startUpload(projectName, "", "", project)
         Looper.myLooper()?.quit()
+        verify(projectUploadController!!).startUpload(projectName, "", "", project)
+        Mockito.verifyNoMoreInteractions(projectUploadController)
     }
 
     @Test
diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/controller/ProjectUploadController.kt b/catroid/src/main/java/org/catrobat/catroid/ui/controller/ProjectUploadController.kt
index 959974a690e..69ceb69e01f 100644
--- a/catroid/src/main/java/org/catrobat/catroid/ui/controller/ProjectUploadController.kt
+++ b/catroid/src/main/java/org/catrobat/catroid/ui/controller/ProjectUploadController.kt
@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2022 The Catrobat Team
+ * Copyright (C) 2010-2023 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -56,7 +56,7 @@ open class ProjectUploadController(private val projectUploadInterface: ProjectUp
         }
     }
 
-    fun startUpload(
+    open fun startUpload(
         projectName: String,
         projectDescription: String,
         projectNotesAndCredits: String?,