diff --git a/PIA VPN.xcodeproj/project.pbxproj b/PIA VPN.xcodeproj/project.pbxproj
index 7a2ffe9a..d89f50da 100644
--- a/PIA VPN.xcodeproj/project.pbxproj	
+++ b/PIA VPN.xcodeproj/project.pbxproj	
@@ -1271,7 +1271,7 @@
 		69CA26B12B59668700E78894 /* RegionsListUseCaseMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegionsListUseCaseMock.swift; sourceTree = "<group>"; };
 		69E192422B8E14DF00A97286 /* PIA VPN-tvOS.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "PIA VPN-tvOS.xctestplan"; sourceTree = "<group>"; };
 		69E192432B8E22FC00A97286 /* PIA-VPN_E2E_Tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "PIA-VPN_E2E_Tests.xctestplan"; sourceTree = "<group>"; };
-		69E192442B8E274500A97286 /* PIA VPN-tvOS_E2E_Tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "PIA VPN-tvOS_E2E_Tests.xctestplan"; sourceTree = "<group>"; };
+		69E192442B8E274500A97286 /* PIA-VPN_tvOS_E2E_Tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "PIA-VPN_tvOS_E2E_Tests.xctestplan"; sourceTree = "<group>"; };
 		69E192462B8E3E8700A97286 /* HelpOptionsViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpOptionsViewModelTests.swift; sourceTree = "<group>"; };
 		69E192482B8E4BCC00A97286 /* PrivacyPolicyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyPolicyView.swift; sourceTree = "<group>"; };
 		69E1924A2B8E63DD00A97286 /* Licences.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Licences.plist; path = "PIA VPN-tvOS/Resources/Licences.plist"; sourceTree = SOURCE_ROOT; };
@@ -2045,7 +2045,7 @@
 			isa = PBXGroup;
 			children = (
 				E58A45592BA8D1BD002A0704 /* PIA Common */,
-				69E192442B8E274500A97286 /* PIA VPN-tvOS_E2E_Tests.xctestplan */,
+				69E192442B8E274500A97286 /* PIA-VPN_tvOS_E2E_Tests.xctestplan */,
 				69E192432B8E22FC00A97286 /* PIA-VPN_E2E_Tests.xctestplan */,
 				69E192422B8E14DF00A97286 /* PIA VPN-tvOS.xctestplan */,
 				8269A6ED251CB5ED000B4DBF /* PIAWidgetExtension.entitlements */,
diff --git a/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA VPN-tvOS.xcscheme b/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA VPN-tvOS.xcscheme
index fad7e912..1f4358d9 100644
--- a/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA VPN-tvOS.xcscheme	
+++ b/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA VPN-tvOS.xcscheme	
@@ -33,7 +33,7 @@
             default = "YES">
          </TestPlanReference>
          <TestPlanReference
-            reference = "container:PIA VPN-tvOS_E2E_Tests.xctestplan">
+            reference = "container:PIA-VPN_tvOS_E2E_Tests.xctestplan">
          </TestPlanReference>
       </TestPlans>
       <Testables>
diff --git a/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA-VPN_E2E_Tests.xcscheme b/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA-VPN_E2E_Tests.xcscheme
index 46ce3480..cafa3088 100644
--- a/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA-VPN_E2E_Tests.xcscheme	
+++ b/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA-VPN_E2E_Tests.xcscheme	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1430"
-   version = "2.2">
+   version = "2.1">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -12,8 +12,9 @@
             buildForProfiling = "NO"
             buildForArchiving = "NO"
             buildForAnalyzing = "NO">
-            <AutocreatedTestPlanReference>
-            </AutocreatedTestPlanReference>
+            <TestPlanReference
+               reference = "container:PIA-VPN_E2E_Tests.xctestplan">
+            </TestPlanReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
diff --git a/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA-VPN_tvOS_E2E_Tests.xcscheme b/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA-VPN_tvOS_E2E_Tests.xcscheme
index 0a5e22ae..3117bd58 100644
--- a/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA-VPN_tvOS_E2E_Tests.xcscheme	
+++ b/PIA VPN.xcodeproj/xcshareddata/xcschemes/PIA-VPN_tvOS_E2E_Tests.xcscheme	
@@ -10,8 +10,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:PIA-VPN_tvOS_E2E_Tests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO"
diff --git a/PIA-VPN_E2E_Tests.xctestplan b/PIA-VPN_E2E_Tests.xctestplan
index b543546b..5d2df83b 100644
--- a/PIA-VPN_E2E_Tests.xctestplan
+++ b/PIA-VPN_E2E_Tests.xctestplan
@@ -22,7 +22,10 @@
         "key" : "PIA_TEST_DEDICATEDIP",
         "value" : "xxx"
       }
-    ]
+    ],
+    "maximumTestRepetitions" : 2,
+    "repeatInNewRunnerProcess" : true,
+    "testRepetitionMode" : "retryOnFailure"
   },
   "testTargets" : [
     {
diff --git a/PIA VPN-tvOS_E2E_Tests.xctestplan b/PIA-VPN_tvOS_E2E_Tests.xctestplan
similarity index 81%
rename from PIA VPN-tvOS_E2E_Tests.xctestplan
rename to PIA-VPN_tvOS_E2E_Tests.xctestplan
index e130f758..ae79339a 100644
--- a/PIA VPN-tvOS_E2E_Tests.xctestplan	
+++ b/PIA-VPN_tvOS_E2E_Tests.xctestplan
@@ -22,10 +22,14 @@
         "key" : "PIA_TEST_PASSWORD",
         "value" : "xxx"
       }
-    ]
+    ],
+    "maximumTestRepetitions" : 2,
+    "repeatInNewRunnerProcess" : true,
+    "testRepetitionMode" : "retryOnFailure"
   },
   "testTargets" : [
     {
+      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:PIA VPN.xcodeproj",
         "identifier" : "35E8E6572B870AD200A3A3DB",
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 3b5cae8a..29953141 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -27,7 +27,7 @@ platform :ios do
   lane :tvos_e2e_tests do
     run_tests(
       scheme: "PIA VPN-tvOS",
-      testplan: "PIA VPN-tvOS_E2E_Tests",
+      testplan: "PIA-VPN_tvOS_E2E_Tests",
       test_without_building: true,
       prelaunch_simulator: true,
       device: "Apple TV"