diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/LauncherActivity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/LauncherActivity.kt
index 2c4daee38d5b9271264a94b6e8c79b86731fd66d..9e4820952921bc9f6418eac2b7b79d7830a80eb5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/LauncherActivity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/LauncherActivity.kt
@@ -1,6 +1,5 @@
 package de.rki.coronawarnapp.ui
 
-import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import de.rki.coronawarnapp.storage.LocalData
@@ -34,15 +33,13 @@ class LauncherActivity : AppCompatActivity() {
     }
 
     private fun startOnboardingActivity() {
-        val onboardingActivity = Intent(this, OnboardingActivity::class.java)
-        startActivity(onboardingActivity)
+        OnboardingActivity.start(this)
         this.overridePendingTransition(0, 0)
         finish()
     }
 
     private fun startMainActivity() {
-        val mainActivityIntent = Intent(this, MainActivity::class.java)
-        startActivity(mainActivityIntent)
+        MainActivity.start(this)
         this.overridePendingTransition(0, 0)
         finish()
     }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
index 7f2204ac8c87c6c52750933a8cf9e3c056407ab8..0abb83ed3ddaa5fd31884b49de05054d4201d1cd 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
@@ -1,5 +1,6 @@
 package de.rki.coronawarnapp.ui.main
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -22,6 +23,10 @@ import de.rki.coronawarnapp.worker.BackgroundWorkScheduler
 class MainActivity : AppCompatActivity() {
     companion object {
         private val TAG: String? = MainActivity::class.simpleName
+
+        fun start(context: Context) {
+            context.startActivity(Intent(context, MainActivity::class.java))
+        }
     }
 
     private val FragmentManager.currentNavigationFragment: Fragment?
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingActivity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingActivity.kt
index 8624ff94d264db5e4e7ea3e889d007f5bec1578c..4da93c88dbf3f80e4bfbd951c00f84e0bdf8e1c1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingActivity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingActivity.kt
@@ -1,5 +1,6 @@
 package de.rki.coronawarnapp.ui.onboarding
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -18,6 +19,11 @@ import de.rki.coronawarnapp.ui.main.MainActivity
 class OnboardingActivity : AppCompatActivity(), LifecycleObserver {
     companion object {
         private val TAG: String? = OnboardingActivity::class.simpleName
+
+        fun start(context: Context) {
+            val intent = Intent(context, OnboardingActivity::class.java)
+            context.startActivity(intent)
+        }
     }
 
     private val FragmentManager.currentNavigationFragment: Fragment?
@@ -43,7 +49,7 @@ class OnboardingActivity : AppCompatActivity(), LifecycleObserver {
     fun completeOnboarding() {
         LocalData.isOnboarded(true)
         LocalData.onboardingCompletedTimestamp(System.currentTimeMillis())
-        startActivity(Intent(this, MainActivity::class.java))
+        MainActivity.start(this)
         finish()
     }
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt
index 38fb5df781d0f26725a8cbfb5f313167f4539909..77b7043444bbbb633a7dd539eb5e0ff7bbd88cd8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt
@@ -1,7 +1,6 @@
 package de.rki.coronawarnapp.ui.settings
 
 import android.app.AlertDialog
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -91,7 +90,7 @@ class SettingsResetFragment : Fragment() {
     }
 
     private fun navigateToOnboarding() {
-        startActivity(Intent(activity, OnboardingActivity::class.java))
+        OnboardingActivity.start(requireContext())
         activity?.finish()
     }