diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index c069b9a..1b1b987 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -1,8 +1,6 @@
 name: Test Backend
 on:
-  push:
-    branches:
-      - '**'
+  pull_request:
     paths:
       - 'lib/**'
       - 'appinfo/**'
@@ -40,6 +38,7 @@ jobs:
         - "32"
         - "33"
         - "34"
+        - "35"
     services:
       db:
         image: ${{ matrix.db.image }}
@@ -111,7 +110,7 @@ jobs:
             custom_apps/fulltextsearch/lib/Command/Test.php
 
       - name: Run fulltextsearch test
-        run: php occ -n fulltextsearch:test --platform_delay 1
+        run: php occ -n fulltextsearch:test
 
       - name: Enable files_fulltextsearch provider
         run: php occ app:enable -f files_fulltextsearch
@@ -121,7 +120,13 @@ jobs:
           php occ info:file '/admin/files/Documents/Nextcloud flyer.pdf' | awk '$1 == "fileid:" { print "TEST_DOC=" $2 }' > "$GITHUB_ENV"
 
       - name: Index test PDF document
-        run: php occ fulltextsearch:document:index admin files "$TEST_DOC"
+        run: &index_doc |
+          if [ "${{ matrix.nextcloud }}" -ge 32 ]; then
+            # workaround for https://github.com/nextcloud/fulltextsearch/issues/1011
+            php occ fulltextsearch:document:index --collection "" admin files "$TEST_DOC"
+          else
+            php occ fulltextsearch:document:index admin files "$TEST_DOC"
+          fi
       
       - name: Search for test PDF document
         run: >
@@ -133,10 +138,10 @@ jobs:
       - name: Identify test ISO-8859-1 document
         run: >
           php occ info:file '/admin/files/iso-8859-1.txt' | awk '$1 == "fileid:" { print "TEST_DOC=" $2 }' > "$GITHUB_ENV"
-      
+
       - name: Index test ISO-8859-1 document
-        run: php occ fulltextsearch:document:index admin files "$TEST_DOC"
-      
+        run: *index_doc
+
       - name: Search for test ISO-8859-1 document
         run: >
           php occ fulltextsearch:search admin testzwecke | tee /dev/stderr | grep -q -e "^ - $TEST_DOC score:" -e "^ *\* id: $TEST_DOC"
diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index e08f72b..f52aa24 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -1,8 +1,6 @@
 name: Test Frontend
 on:
-  push:
-    branches:
-      - '**'
+  pull_request:
     paths:
       - 'js/**'
       - 'src/**'
diff --git a/appinfo/info.xml b/appinfo/info.xml
index e56a0ed..d5f38c7 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -32,7 +32,7 @@ Currently can not index office document formats, but does work with PDFs (if the
 	<bugs>https://github.com/jplitza/fulltextsearch_sql/issues</bugs>
 	<repository>https://github.com/jplitza/fulltextsearch_sql.git</repository>
 	<dependencies>
-		<nextcloud min-version="31" max-version="34"/>
+		<nextcloud min-version="31" max-version="35"/>
 		<database min-version="10.9">mysql</database>
 		<database min-version="17">pgsql</database>
 	</dependencies>