diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0fd28592a1fa15944d7b5be3b1400ead44c6fab3
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,11 @@
+container:
+    image: python
+    cpu: 1
+    memory: 100M
+
+task:
+    name: Validate Play Store and F-Droid descriptions
+    play-stable-script: python3 assets/store_descriptions/generate_and_validate.py play
+    play-beta-script: python3 assets/store_descriptions/generate_and_validate.py playBeta
+    fdroid-stable-script: python3 assets/store_descriptions/generate_and_validate.py fdroid
+    fdroid-beta-script: python3 assets/store_descriptions/generate_and_validate.py fdroidBeta
diff --git a/.travis.yml b/.travis.yml
index 64f5b8e72a865ac7b28be3106989739a442f8c40..29923a894c46fa06bdd638a8574b0bbf72cff330 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,11 +51,6 @@ jobs:
       env:
         - desc="Uploads to GitHub"
       if: branch != l10n-crowdin AND tag != "-fdroid$" AND tag IS present
-    - stage: test
-      script: python3 assets/store_descriptions/generate_and_validate.py fdroidBeta
-      env:
-        - desc="Validate strings"
-      if: tag != "-fdroid$"
     - stage: deploy
       script: bash travis/prepare-deploy.sh
       if: tag IS present AND tag != "-fdroid$"