diff --git a/Mastodon.xcodeproj/xcshareddata/xcschemes/Mastodon.xcscheme b/Mastodon.xcodeproj/xcshareddata/xcschemes/Mastodon.xcscheme
index 70507b96c..de059787b 100644
--- a/Mastodon.xcodeproj/xcshareddata/xcschemes/Mastodon.xcscheme
+++ b/Mastodon.xcodeproj/xcshareddata/xcschemes/Mastodon.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1250"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,6 +27,12 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:Mastodon/Mastodon.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
diff --git a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
index aa31690df..fc6bfd208 100644
--- a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>AppShared.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>33</integer>
+			<integer>35</integer>
 		</dict>
 		<key>CoreDataStack.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>34</integer>
+			<integer>32</integer>
 		</dict>
 		<key>Mastodon - ASDK.xcscheme_^#shared#^_</key>
 		<dict>
@@ -87,7 +87,7 @@
 		<key>MastodonIntent.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>32</integer>
+			<integer>34</integer>
 		</dict>
 		<key>MastodonIntents.xcscheme_^#shared#^_</key>
 		<dict>
@@ -107,7 +107,7 @@
 		<key>ShareActionExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>35</integer>
+			<integer>33</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
diff --git a/Mastodon/Mastodon.xctestplan b/Mastodon/Mastodon.xctestplan
index b7693b556..bb3dcf385 100644
--- a/Mastodon/Mastodon.xctestplan
+++ b/Mastodon/Mastodon.xctestplan
@@ -2,9 +2,72 @@
   "configurations" : [
     {
       "id" : "63D68260-F74D-4CA6-ADBC-B1263DD6BE55",
-      "name" : "Configuration 1",
+      "name" : "English",
       "options" : {
-
+        "language" : "en"
+      }
+    },
+    {
+      "id" : "06DB4A21-6DDF-454F-ABEE-E77DD7AAA146",
+      "name" : "Arabic",
+      "options" : {
+        "language" : "ar"
+      }
+    },
+    {
+      "id" : "D95412BD-821C-4FE5-9DA6-8D77C0972B72",
+      "name" : "Catalan",
+      "options" : {
+        "language" : "ca"
+      }
+    },
+    {
+      "id" : "EE9219EA-2011-48B5-A475-309C99F91D6D",
+      "name" : "Chinese, Simplified",
+      "options" : {
+        "language" : "zh-Hans"
+      }
+    },
+    {
+      "id" : "6FBBAF31-D445-482E-B67B-271F8216AEB6",
+      "name" : "Dutch",
+      "options" : {
+        "language" : "nl"
+      }
+    },
+    {
+      "id" : "45A93B8D-54C5-4906-8AC6-5B6FE561CA25",
+      "name" : "French",
+      "options" : {
+        "language" : "fr"
+      }
+    },
+    {
+      "id" : "8344111A-3025-4CA0-838C-AF94EBA4D4BE",
+      "name" : "German",
+      "options" : {
+        "language" : "de"
+      }
+    },
+    {
+      "id" : "4EE64E47-F9E5-4189-8571-20D29941F854",
+      "name" : "Japanese",
+      "options" : {
+        "language" : "ja"
+      }
+    },
+    {
+      "id" : "746F1EBA-E12B-40C4-85C6-A14DC61A180B",
+      "name" : "Spanish",
+      "options" : {
+        "language" : "es"
+      }
+    },
+    {
+      "id" : "EDA29FF5-1F0E-451A-863D-0899CE07CB09",
+      "name" : "Spanish (Latin America)",
+      "options" : {
+        "language" : "es-419"
       }
     }
   ],
@@ -13,6 +76,7 @@
   },
   "testTargets" : [
     {
+      "enabled" : false,
       "target" : {
         "containerPath" : "container:Mastodon.xcodeproj",
         "identifier" : "DB427DE725BAA00100D1B89D",
@@ -20,6 +84,9 @@
       }
     },
     {
+      "skippedTests" : [
+        "MastodonUITests\/testLaunchPerformance()"
+      ],
       "target" : {
         "containerPath" : "container:Mastodon.xcodeproj",
         "identifier" : "DB427DF225BAA00100D1B89D",
diff --git a/MastodonUITests/MastodonUITests.swift b/MastodonUITests/MastodonUITests.swift
index dbfca415e..df1f6b907 100644
--- a/MastodonUITests/MastodonUITests.swift
+++ b/MastodonUITests/MastodonUITests.swift
@@ -21,8 +21,8 @@ class MastodonUITests: XCTestCase {
     override func tearDownWithError() throws {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
-
-    func testExample() throws {
+ 
+    func testSmoke() throws {
         // UI tests must launch the application that they test.
         let app = XCUIApplication()
         app.launch()