Move :e2e project to :test:e2e

Also changes source directory from "java" to "kotlin" which is
supported since upgrading the project from AGP 3.x to 7.x.

25 files changed, 61 insertions, 61 deletions

diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 917a0b21e7..7e4d1f1bdd 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -1,2 +1,2 @@
 include(":app")
-include(":test", ":e2e")
+include(":test", ":test:e2e")
diff --git a/android/e2e/README.md b/android/test/e2e/README.md
index 2eb3663300..7c1271ad97 100644
--- a/android/e2e/README.md
+++ b/android/test/e2e/README.md
@@ -6,7 +6,7 @@ The tests in this module are end-to-end tests that rely on the publicly accessib
 ### Locally
 Set tokens in the below command and then execute the command in the `android` directory to run the tests on a local device:
 ```
-./gradlew :e2e:connectedDebugAndroidTest \
+./gradlew :test:e2e:connectedDebugAndroidTest \
     -Pvalid_test_account_token=XXXX \
     -Pinvalid_test_account_token=XXXX
 ```
@@ -24,7 +24,7 @@ adb shell 'CLASSPATH=$(pm path androidx.test.services) app_process / \
     -e clearPackageData true \
     -e valid_test_account_token XXXX \
     -e invalid_test_account_token XXXX \
-    -e targetInstrumentation net.mullvad.mullvadvpn.e2e/androidx.test.runner.AndroidJUnitRunner \
+    -e targetInstrumentation net.mullvad.mullvadvpn.test.e2e/androidx.test.runner.AndroidJUnitRunner \
     androidx.test.orchestrator/.AndroidTestOrchestrator'
 ```
 
@@ -38,7 +38,7 @@ Firebase Test Lab can be used to run the tests on vast collection of physical an
 gcloud firebase test android run \
     --type instrumentation \
     --app ./android/app/build/outputs/apk/debug/app-debug.apk \
-    --test ./android/e2e/build/outputs/apk/debug/e2e-debug.apk \
+    --test ./android/test/e2e/build/outputs/apk/debug/e2e-debug.apk \
     --device model=redfin,version=30,locale=en,orientation=portrait \
     --use-orchestrator \
     --environment-variables clearPackageData=true,valid_test_account_token=XXXX,invalid_test_account_token=XXXX
@@ -49,7 +49,7 @@ If using gcloud via the docker image, the following can be executed in the `andr
 docker run --rm --volumes-from gcloud-config -v ${PWD}:/android gcr.io/google.com/cloudsdktool/google-cloud-cli gcloud firebase test android run \
     --type instrumentation \
     --app ./android/app/build/outputs/apk/debug/app-debug.apk \
-    --test ./android/e2e/build/outputs/apk/debug/e2e-debug.apk \
+    --test ./android/test/e2e/build/outputs/apk/debug/e2e-debug.apk \
     --device model=redfin,version=30,locale=en,orientation=portrait \
     --use-orchestrator \
     --environment-variables clearPackageData=true,valid_test_account_token=XXXX,invalid_test_account_token=XXXX
diff --git a/android/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
index 1ea4f94058..8c9082c6ef 100644
--- a/android/e2e/build.gradle.kts
+++ b/android/test/e2e/build.gradle.kts
@@ -7,13 +7,13 @@ plugins {
 }
 
 android {
-    namespace = "net.mullvad.mullvadvpn.e2e"
+    namespace = "net.mullvad.mullvadvpn.test.e2e"
     compileSdk = Versions.Android.compileSdkVersion
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
         targetSdk = Versions.Android.targetSdkVersion
-        testApplicationId = "net.mullvad.mullvadvpn.e2e"
+        testApplicationId = "net.mullvad.mullvadvpn.test.e2e"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         targetProjectPath = ":app"
 
diff --git a/android/e2e/e2e-suppression.xml b/android/test/e2e/e2e-suppression.xml
index 2b57bc13e8..2b57bc13e8 100644
--- a/android/e2e/e2e-suppression.xml
+++ b/android/test/e2e/e2e-suppression.xml
diff --git a/android/e2e/e2e.properties b/android/test/e2e/e2e.properties
index b02f6a9381..b02f6a9381 100644
--- a/android/e2e/e2e.properties
+++ b/android/test/e2e/e2e.properties
diff --git a/android/e2e/src/main/AndroidManifest.xml b/android/test/e2e/src/main/AndroidManifest.xml
index 931f79d291..931f79d291 100644
--- a/android/e2e/src/main/AndroidManifest.xml
+++ b/android/test/e2e/src/main/AndroidManifest.xml
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/ConnectionTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/ConnectionTest.kt
index 4334ae2265..feabbc5335 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/ConnectionTest.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/ConnectionTest.kt
@@ -1,10 +1,10 @@
-package net.mullvad.mullvadvpn.e2e
+package net.mullvad.mullvadvpn.test.e2e
 
 import androidx.test.uiautomator.By
 import junit.framework.Assert.assertEquals
-import net.mullvad.mullvadvpn.e2e.extension.findObjectWithTimeout
-import net.mullvad.mullvadvpn.e2e.interactor.WebViewInteractor
-import net.mullvad.mullvadvpn.e2e.misc.CleanupAccountTestRule
+import net.mullvad.mullvadvpn.test.e2e.extension.findObjectWithTimeout
+import net.mullvad.mullvadvpn.test.e2e.interactor.WebViewInteractor
+import net.mullvad.mullvadvpn.test.e2e.misc.CleanupAccountTestRule
 import org.junit.Rule
 import org.junit.Test
 
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/EndToEndTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt
index d3f3c564b7..8adf065663 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/EndToEndTest.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt
@@ -1,15 +1,15 @@
-package net.mullvad.mullvadvpn.e2e
+package net.mullvad.mullvadvpn.test.e2e
 
 import android.content.Context
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4
 import androidx.test.uiautomator.UiDevice
-import net.mullvad.mullvadvpn.e2e.constant.INVALID_TEST_ACCOUNT_TOKEN_ARGUMENT_KEY
-import net.mullvad.mullvadvpn.e2e.constant.VALID_TEST_ACCOUNT_TOKEN_ARGUMENT_KEY
-import net.mullvad.mullvadvpn.e2e.extension.getRequiredArgument
-import net.mullvad.mullvadvpn.e2e.interactor.AppInteractor
-import net.mullvad.mullvadvpn.e2e.interactor.WebViewInteractor
-import net.mullvad.mullvadvpn.e2e.misc.CaptureScreenshotOnFailedTestRule
+import net.mullvad.mullvadvpn.test.e2e.constant.INVALID_TEST_ACCOUNT_TOKEN_ARGUMENT_KEY
+import net.mullvad.mullvadvpn.test.e2e.constant.VALID_TEST_ACCOUNT_TOKEN_ARGUMENT_KEY
+import net.mullvad.mullvadvpn.test.e2e.extension.getRequiredArgument
+import net.mullvad.mullvadvpn.test.e2e.interactor.AppInteractor
+import net.mullvad.mullvadvpn.test.e2e.interactor.WebViewInteractor
+import net.mullvad.mullvadvpn.test.e2e.misc.CaptureScreenshotOnFailedTestRule
 import org.junit.Before
 import org.junit.Rule
 import org.junit.runner.RunWith
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/LaunchAppTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LaunchAppTest.kt
index c873d3452c..64f534990c 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/LaunchAppTest.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LaunchAppTest.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e
+package net.mullvad.mullvadvpn.test.e2e
 
 import androidx.test.runner.AndroidJUnit4
 import org.junit.Test
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/LoginTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LoginTest.kt
index 4919fb823f..d16795e5dd 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/LoginTest.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LoginTest.kt
@@ -1,11 +1,11 @@
-package net.mullvad.mullvadvpn.e2e
+package net.mullvad.mullvadvpn.test.e2e
 
 import androidx.test.runner.AndroidJUnit4
 import androidx.test.uiautomator.By
 import junit.framework.Assert.assertNotNull
-import net.mullvad.mullvadvpn.e2e.constant.LOGIN_FAILURE_TIMEOUT
-import net.mullvad.mullvadvpn.e2e.extension.findObjectWithTimeout
-import net.mullvad.mullvadvpn.e2e.misc.CleanupAccountTestRule
+import net.mullvad.mullvadvpn.test.e2e.constant.LOGIN_FAILURE_TIMEOUT
+import net.mullvad.mullvadvpn.test.e2e.extension.findObjectWithTimeout
+import net.mullvad.mullvadvpn.test.e2e.misc.CleanupAccountTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/WebLinkTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt
index aaff57de65..a6a04bf094 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/WebLinkTest.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt
@@ -1,7 +1,7 @@
-package net.mullvad.mullvadvpn.e2e
+package net.mullvad.mullvadvpn.test.e2e
 
 import androidx.test.uiautomator.By
-import net.mullvad.mullvadvpn.e2e.extension.findObjectWithTimeout
+import net.mullvad.mullvadvpn.test.e2e.extension.findObjectWithTimeout
 import org.junit.Test
 
 class WebLinkTest : EndToEndTest() {
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/constant/Constants.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/constant/Constants.kt
index 3b6a04b51e..23f29fca3c 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/constant/Constants.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/constant/Constants.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e.constant
+package net.mullvad.mullvadvpn.test.e2e.constant
 
 const val LOG_TAG = "mullvad-e2e"
 const val CONN_CHECK_URL = "https://mullvad.net/en/check/"
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/constant/PackageConstants.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/constant/PackageConstants.kt
index 47aeaa0237..5476c37687 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/constant/PackageConstants.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/constant/PackageConstants.kt
@@ -1,3 +1,3 @@
-package net.mullvad.mullvadvpn.e2e.constant
+package net.mullvad.mullvadvpn.test.e2e.constant
 
 const val MULLVAD_PACKAGE = "net.mullvad.mullvadvpn"
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/constant/ResourceConstants.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/constant/ResourceConstants.kt
index 07b2f03311..7b27a581ad 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/constant/ResourceConstants.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/constant/ResourceConstants.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e.constant
+package net.mullvad.mullvadvpn.test.e2e.constant
 
 const val SETTINGS_COG_ID = "net.mullvad.mullvadvpn:id/settings"
 const val TUNNEL_INFO_ID = "net.mullvad.mullvadvpn:id/tunnel_info"
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/constant/TextConstants.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/constant/TextConstants.kt
index ff8e0088d4..cfc4080ea4 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/constant/TextConstants.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/constant/TextConstants.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e.constant
+package net.mullvad.mullvadvpn.test.e2e.constant
 
 const val CONNECTION_CHECK_IS_CONNECTED = "Using Mullvad VPN"
 const val CONNECTION_CHECK_IS_NOT_CONNECTED = "Not using Mullvad VPN"
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/constant/TimeoutConstants.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/constant/TimeoutConstants.kt
index ecc70c28b1..6599a26bcd 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/constant/TimeoutConstants.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/constant/TimeoutConstants.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e.constant
+package net.mullvad.mullvadvpn.test.e2e.constant
 
 const val APP_LAUNCH_TIMEOUT = 5000L
 const val CONNECTION_TIMEOUT = 30000L
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/extension/BundleExtensions.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/extension/BundleExtensions.kt
index 275bd0b9c7..c96c28bb09 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/extension/BundleExtensions.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/extension/BundleExtensions.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e.extension
+package net.mullvad.mullvadvpn.test.e2e.extension
 
 import android.os.Bundle
 
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/extension/UiAutomatorExtensions.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/extension/UiAutomatorExtensions.kt
index 5ecc16016d..5d96f4cc45 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/extension/UiAutomatorExtensions.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/extension/UiAutomatorExtensions.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e.extension
+package net.mullvad.mullvadvpn.test.e2e.extension
 
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.BySelector
@@ -6,7 +6,7 @@ import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiObject2
 import androidx.test.uiautomator.Until
 import java.util.regex.Pattern
-import net.mullvad.mullvadvpn.e2e.constant.DEFAULT_INTERACTION_TIMEOUT
+import net.mullvad.mullvadvpn.test.e2e.constant.DEFAULT_INTERACTION_TIMEOUT
 
 fun UiDevice.findObjectByCaseInsensitiveText(text: String): UiObject2 {
     return findObjectWithTimeout(By.text(Pattern.compile(text, Pattern.CASE_INSENSITIVE)))
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/interactor/AppInteractor.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/AppInteractor.kt
index 680850e718..a6739b91e5 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/interactor/AppInteractor.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/AppInteractor.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e.interactor
+package net.mullvad.mullvadvpn.test.e2e.interactor
 
 import android.content.Context
 import android.content.Intent
@@ -6,14 +6,14 @@ import android.widget.ImageButton
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.Until
-import net.mullvad.mullvadvpn.e2e.constant.APP_LAUNCH_TIMEOUT
-import net.mullvad.mullvadvpn.e2e.constant.CONNECTION_TIMEOUT
-import net.mullvad.mullvadvpn.e2e.constant.LOGIN_TIMEOUT
-import net.mullvad.mullvadvpn.e2e.constant.MULLVAD_PACKAGE
-import net.mullvad.mullvadvpn.e2e.constant.SETTINGS_COG_ID
-import net.mullvad.mullvadvpn.e2e.constant.TUNNEL_INFO_ID
-import net.mullvad.mullvadvpn.e2e.constant.TUNNEL_OUT_ADDRESS_ID
-import net.mullvad.mullvadvpn.e2e.extension.findObjectWithTimeout
+import net.mullvad.mullvadvpn.test.e2e.constant.APP_LAUNCH_TIMEOUT
+import net.mullvad.mullvadvpn.test.e2e.constant.CONNECTION_TIMEOUT
+import net.mullvad.mullvadvpn.test.e2e.constant.LOGIN_TIMEOUT
+import net.mullvad.mullvadvpn.test.e2e.constant.MULLVAD_PACKAGE
+import net.mullvad.mullvadvpn.test.e2e.constant.SETTINGS_COG_ID
+import net.mullvad.mullvadvpn.test.e2e.constant.TUNNEL_INFO_ID
+import net.mullvad.mullvadvpn.test.e2e.constant.TUNNEL_OUT_ADDRESS_ID
+import net.mullvad.mullvadvpn.test.e2e.extension.findObjectWithTimeout
 
 class AppInteractor(
     private val device: UiDevice,
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/interactor/MullvadAccountInteractor.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/MullvadAccountInteractor.kt
index 08c5a698c3..8f3f55166f 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/interactor/MullvadAccountInteractor.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/MullvadAccountInteractor.kt
@@ -1,6 +1,6 @@
-package net.mullvad.mullvadvpn.e2e.interactor
+package net.mullvad.mullvadvpn.test.e2e.interactor
 
-import net.mullvad.mullvadvpn.e2e.misc.SimpleMullvadHttpClient
+import net.mullvad.mullvadvpn.test.e2e.misc.SimpleMullvadHttpClient
 
 class MullvadAccountInteractor(
     private val httpClient: SimpleMullvadHttpClient,
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/interactor/SystemSettingsInteractor.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/SystemSettingsInteractor.kt
index 29cef35b0a..bbe941d488 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/interactor/SystemSettingsInteractor.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/SystemSettingsInteractor.kt
@@ -1,11 +1,11 @@
-package net.mullvad.mullvadvpn.e2e.interactor
+package net.mullvad.mullvadvpn.test.e2e.interactor
 
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
-import net.mullvad.mullvadvpn.e2e.extension.findObjectByCaseInsensitiveText
+import net.mullvad.mullvadvpn.test.e2e.extension.findObjectByCaseInsensitiveText
 
 class SystemSettingsInteractor(
     private val uiDevice: UiDevice,
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/interactor/WebViewInteractor.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/WebViewInteractor.kt
index df5afc4605..fd809b13dd 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/interactor/WebViewInteractor.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/WebViewInteractor.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e.interactor
+package net.mullvad.mullvadvpn.test.e2e.interactor
 
 import android.content.Context
 import android.content.Intent
@@ -7,10 +7,10 @@ import android.webkit.WebView
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import net.mullvad.mullvadvpn.TestActivity
-import net.mullvad.mullvadvpn.e2e.constant.CONNECTION_CHECK_IS_CONNECTED
-import net.mullvad.mullvadvpn.e2e.constant.CONN_CHECK_URL
-import net.mullvad.mullvadvpn.e2e.extension.findObjectByCaseInsensitiveText
-import net.mullvad.mullvadvpn.e2e.extension.findObjectWithTimeout
+import net.mullvad.mullvadvpn.test.e2e.constant.CONNECTION_CHECK_IS_CONNECTED
+import net.mullvad.mullvadvpn.test.e2e.constant.CONN_CHECK_URL
+import net.mullvad.mullvadvpn.test.e2e.extension.findObjectByCaseInsensitiveText
+import net.mullvad.mullvadvpn.test.e2e.extension.findObjectWithTimeout
 
 class WebViewInteractor(
     private val context: Context,
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/misc/CaptureScreenshotOnFailedTestRule.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/CaptureScreenshotOnFailedTestRule.kt
index 82c43c958b..5be65f7ec8 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/misc/CaptureScreenshotOnFailedTestRule.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/CaptureScreenshotOnFailedTestRule.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e.misc
+package net.mullvad.mullvadvpn.test.e2e.misc
 
 import android.util.Log
 import androidx.test.runner.screenshot.BasicScreenCaptureProcessor
@@ -6,7 +6,7 @@ import androidx.test.runner.screenshot.ScreenCaptureProcessor
 import androidx.test.runner.screenshot.Screenshot
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
-import net.mullvad.mullvadvpn.e2e.constant.LOG_TAG
+import net.mullvad.mullvadvpn.test.e2e.constant.LOG_TAG
 import org.junit.rules.TestWatcher
 import org.junit.runner.Description
 
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/misc/CleanupAccountTestRule.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/CleanupAccountTestRule.kt
index 17f7f86f6c..4ed5e72512 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/misc/CleanupAccountTestRule.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/CleanupAccountTestRule.kt
@@ -1,11 +1,11 @@
-package net.mullvad.mullvadvpn.e2e.misc
+package net.mullvad.mullvadvpn.test.e2e.misc
 
 import android.util.Log
 import androidx.test.platform.app.InstrumentationRegistry
-import net.mullvad.mullvadvpn.e2e.constant.LOG_TAG
-import net.mullvad.mullvadvpn.e2e.constant.VALID_TEST_ACCOUNT_TOKEN_ARGUMENT_KEY
-import net.mullvad.mullvadvpn.e2e.extension.getRequiredArgument
-import net.mullvad.mullvadvpn.e2e.interactor.MullvadAccountInteractor
+import net.mullvad.mullvadvpn.test.e2e.constant.LOG_TAG
+import net.mullvad.mullvadvpn.test.e2e.constant.VALID_TEST_ACCOUNT_TOKEN_ARGUMENT_KEY
+import net.mullvad.mullvadvpn.test.e2e.extension.getRequiredArgument
+import net.mullvad.mullvadvpn.test.e2e.interactor.MullvadAccountInteractor
 import org.junit.rules.TestWatcher
 import org.junit.runner.Description
 
diff --git a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/misc/SimpleMullvadHttpClient.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt
index ebd90f1bac..b06ecee780 100644
--- a/android/e2e/src/main/java/net/mullvad/mullvadvpn/e2e/misc/SimpleMullvadHttpClient.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.e2e.misc
+package net.mullvad.mullvadvpn.test.e2e.misc
 
 import android.content.Context
 import android.util.Log
@@ -9,8 +9,8 @@ import com.android.volley.toolbox.JsonObjectRequest
 import com.android.volley.toolbox.RequestFuture
 import com.android.volley.toolbox.StringRequest
 import com.android.volley.toolbox.Volley
-import net.mullvad.mullvadvpn.e2e.BuildConfig
-import net.mullvad.mullvadvpn.e2e.constant.LOG_TAG
+import net.mullvad.mullvadvpn.test.e2e.BuildConfig
+import net.mullvad.mullvadvpn.test.e2e.constant.LOG_TAG
 import org.json.JSONArray
 import org.json.JSONObject