diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 39c44e7f..086a17a9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ jobs:
       matrix:
         python-version: ["3.11", "3.10", "3.9", "3.8"]
         plone-version: ["5.2", "6.0"]
-        solr-version: ["9.0.x", "9.1.x"]
+        solr-version: ["9.0.x", "9.1.x", "9.5.x"]
         exclude:
           - python-version: "3.11"
             plone-version: "5.2"
diff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg
index 825f1e21..058159f1 100644
--- a/plone-6.0.x.cfg
+++ b/plone-6.0.x.cfg
@@ -1,6 +1,6 @@
 [buildout]
 extends =
-    https://dist.plone.org/release/6.0.9/versions.cfg
+    https://dist.plone.org/release/6.0.13/versions.cfg
     base.cfg
 versions = versions
 
diff --git a/requirements-6.0.x.txt b/requirements-6.0.x.txt
index 0ef1af7d..2d916ba7 100644
--- a/requirements-6.0.x.txt
+++ b/requirements-6.0.x.txt
@@ -1,8 +1,8 @@
-# https://dist.plone.org/release/6.0.9/requirements.txt
-pip==23.3.1
-setuptools==69.0.2
-wheel==0.42.0
-zc.buildout==3.0.1
+# https://dist.plone.org/release/6.0.13/requirements.txt
+pip==24.2
+setuptools==74.0.0
+wheel==0.44.0
+zc.buildout==3.1.0
 
 # Windows specific down here (has to be installed here, fails in buildout)
 # Dependency of zope.sendmail:
@@ -10,3 +10,8 @@ pywin32 ; platform_system == 'Windows'
 
 # SSL Certs on windows, because Python is missing them otherwise:
 certifi ; platform_system == 'Windows'
+
+# VSCode robotframework-lsp requires robotframework directly in venv
+robotframework==6.0.2
+# robotframework >= 6.1 is only supported with robotframwork-lsp >= 1.11.0,
+# but https://github.com/robocorp/robotframework-lsp/issues/947
diff --git a/setup.py b/setup.py
index 925697fc..844ee45a 100644
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,7 @@
         "Framework :: Plone",
         "Framework :: Plone :: 5.2",
         "Framework :: Plone :: 6.0",
+        "Framework :: Plone :: 6.1",
         "Framework :: Plone :: Addon",
         "Intended Audience :: Developers",
         "Intended Audience :: System Administrators",
diff --git a/solr-9.5.x.cfg b/solr-9.5.x.cfg
new file mode 100644
index 00000000..b36b6b96
--- /dev/null
+++ b/solr-9.5.x.cfg
@@ -0,0 +1,4 @@
+[solr]
+recipe = kitconcept.recipe.solr
+src = https://www.apache.org/dyn/closer.lua/solr/solr/9.5.0/solr-9.5.0.tgz?action=download
+solr-config = config
\ No newline at end of file