diff --git a/CHANGES.rst b/CHANGES.rst
index 6a2620959..5fb6fdd12 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -22,6 +22,33 @@ Changes to be released in next version
 Others
  * 
 
+Changes in 1.2.8 (2021-03-26)
+=================================================
+
+✨ Features
+ * 
+
+🙌 Improvements
+ * 
+
+🐛 Bugfix
+ * Xcodegen: Unit tests are broken (#4152).
+
+⚠️ API Changes
+ * 
+
+🗣 Translations
+ * 
+    
+🧱 Build
+ * 
+
+Others
+ * 
+
+Improvements:
+
+
 Changes in 1.2.7 (2021-03-24)
 =================================================
 
diff --git a/Config/AppIdentifiers.xcconfig b/Config/AppIdentifiers.xcconfig
index ebcc71705..9c0a99957 100644
--- a/Config/AppIdentifiers.xcconfig
+++ b/Config/AppIdentifiers.xcconfig
@@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector
 APPLICATION_SCHEME = element
 
 // Version
-MARKETING_VERSION = 1.2.8
-CURRENT_PROJECT_VERSION = 1.2.8
+MARKETING_VERSION = 1.2.9
+CURRENT_PROJECT_VERSION = 1.2.9
 
 
 // Team
diff --git a/RiotTests/Debug.xcconfig b/RiotTests/Debug.xcconfig
new file mode 100644
index 000000000..be053c75b
--- /dev/null
+++ b/RiotTests/Debug.xcconfig
@@ -0,0 +1,20 @@
+// 
+// Copyright 2020 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+#include "Pods/Target Support Files/Pods-RiotTests/Pods-RiotTests.debug.xcconfig"
diff --git a/RiotTests/Release.xcconfig b/RiotTests/Release.xcconfig
new file mode 100644
index 000000000..5a62ed9cd
--- /dev/null
+++ b/RiotTests/Release.xcconfig
@@ -0,0 +1,20 @@
+// 
+// Copyright 2020 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+#include "Pods/Target Support Files/Pods-RiotTests/Pods-RiotTests.release.xcconfig"
diff --git a/RiotTests/target.yml b/RiotTests/target.yml
index 83cd4c55e..fa2288a2e 100644
--- a/RiotTests/target.yml
+++ b/RiotTests/target.yml
@@ -33,15 +33,19 @@ targets:
     dependencies:
     - target: Riot
 
+    configFiles:
+      Debug: Debug.xcconfig
+      Release: Release.xcconfig
+
     settings:
       base:
         BUNDLE_LOADER: $(TEST_HOST)
         FRAMEWORK_SEARCH_PATHS: $(SDKROOT)/Developer/Library/Frameworks $(inherited)
-        INFOPLIST_FILE: Info.plist
+        INFOPLIST_FILE: RiotTests/Info.plist
         LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @loader_path/Frameworks
         PRODUCT_BUNDLE_IDENTIFIER: org.matrix.$(PRODUCT_NAME:rfc1034identifier)
         PRODUCT_NAME: RiotTests
-        SWIFT_OBJC_BRIDGING_HEADER: RiotTests-Bridging-Header.h
+        SWIFT_OBJC_BRIDGING_HEADER: RiotTests/RiotTests-Bridging-Header.h
         TEST_HOST: $(BUILT_PRODUCTS_DIR)/Riot.app/Riot
       configs:
         Debug:
@@ -49,4 +53,14 @@ targets:
           PROVISIONING_PROFILE: $(RIOT_PROVISIONING_PROFILE)
           PROVISIONING_PROFILE_SPECIFIER: $(RIOT_PROVISIONING_PROFILE_SPECIFIER)
 
-    sources: .
+    sources:
+    - path: .
+    - path: ../Config/Configurable.swift
+    - path: ../Config/BuildSettings.swift
+    - path: ../Config/AppConfiguration.swift
+    - path: ../Config/CommonConfiguration.swift
+    - path: ../Riot/Categories/Bundle.swift
+    - path: ../Riot/Generated/InfoPlist.swift
+    - path: ../Riot/Managers/Settings/RiotSettings.swift
+    - path: ../Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
+    - path: ../Riot/Managers/KeyValueStorage/