diff --git a/checkouts.cfg b/checkouts.cfg
index 7ed5f1f663..89d79824fe 100644
--- a/checkouts.cfg
+++ b/checkouts.cfg
@@ -20,3 +20,5 @@ auto-checkout =
     plone.app.z3cform
     plone.schemaeditor
     Products.statusmessages
+    collective.recipe.vscode
+    robotsuite
diff --git a/core.cfg b/core.cfg
index 624a4a8636..db992ef9b8 100644
--- a/core.cfg
+++ b/core.cfg
@@ -103,6 +103,7 @@ eggs =
 [vscode]
 recipe = collective.recipe.vscode
 eggs = ${test:eggs}
+robot-enabled = true
 flake8-enabled = false
 black-enabled = true
 generate-envfile = true
diff --git a/requirements.txt b/requirements.txt
index 12c96130f1..cf0bf86f1d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,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/sources.cfg b/sources.cfg
index 1937cdd9cd..12239e04d4 100644
--- a/sources.cfg
+++ b/sources.cfg
@@ -36,6 +36,7 @@ plone.themepreview                  = git ${remotes:plone}/plone.themepreview.gi
 borg.localrole                      = git ${remotes:plone}/borg.localrole.git pushurl=${remotes:plone_push}/borg.localrole.git branch=master
 collective.monkeypatcher            = git ${remotes:plone}/collective.monkeypatcher.git pushurl=${remotes:plone_push}/collective.monkeypatcher.git branch=master
 collective.recipe.omelette          = git ${remotes:collective}/collective.recipe.omelette.git pushurl=${remotes:collective_push}/collective.recipe.omelette.git branch=master
+collective.recipe.vscode            = git https://github.com/datakurre/collective.recipe.vscode.git pushurl=git@github.com:datakurre/collective.recipe.vscode.git branch=master
 collective.xmltestreport            = git ${remotes:collective}/collective.xmltestreport.git pushurl=${remotes:collective_push}/collective.xmltestreport.git branch=master
 diazo                               = git ${remotes:plone}/diazo.git pushurl=${remotes:plone_push}/diazo.git branch=master
 five.customerize                    = git ${remotes:zope}/five.customerize.git pushurl=${remotes:zope_push}/five.customerize.git branch=master
@@ -159,7 +160,7 @@ Products.statusmessages             = git ${remotes:plone}/Products.statusmessag
 Products.validation                 = git ${remotes:plone}/Products.validation.git pushurl=${remotes:plone_push}/Products.validation.git branch=master
 Products.ZopeVersionControl         = git ${remotes:zope}/Products.ZopeVersionControl.git pushurl=${remotes:zope_push}/Products.ZopeVersionControl.git branch=master
 repoze.xmliter                      = git https://github.com/repoze/repoze.xmliter.git pushurl=git@github.com:repoze/repoze.xmliter.git branch=master
-robotsuite                          = git ${remotes:collective}/robotsuite.git pushurl=${remotes:collective_push}/robotsuite.git
+robotsuite                          = git ${remotes:collective}/robotsuite.git pushurl=${remotes:collective_push}/robotsuite.git branch=datakurre-rfbrowser
 z3c.batching                        = git ${remotes:zope}/z3c.batching.git pushurl=${remotes:zope_push}/z3c.batching.git branch=master
 z3c.caching                         = git ${remotes:zope}/z3c.caching.git pushurl=${remotes:zope_push}/z3c.caching.git branch=master
 z3c.form                            = git ${remotes:zope}/z3c.form.git pushurl=${remotes:zope_push}/z3c.form.git branch=master
diff --git a/tests.cfg b/tests.cfg
index 9f91a50804..b5a59b59bc 100644
--- a/tests.cfg
+++ b/tests.cfg
@@ -33,6 +33,7 @@ test-eggs =
     plone.app.redirector
     plone.app.registry
     plone.app.relationfield
+#    plone.app.robotframework [test]
     plone.app.testing [test]
     plone.app.textfield [tests]
     plone.app.theming [test]
@@ -132,9 +133,11 @@ eggs =
     ${buildout:test-eggs}
     robotframework-selenium2screenshots
     plone.app.robotframework[reload,debug]
+    robotframework-browser
 # We do not want to install all scripts from the test-eggs.
 scripts =
     ride
     robot
     robot-debug
     robot-server
+    rfbrowser
diff --git a/versions.cfg b/versions.cfg
index 70bd2ea98a..3295a82760 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -218,7 +218,10 @@ python-dateutil = 2.8.2
 python-dotenv = 1.0.0
 PyYAML = 6.0
 responses = 0.23.1
-robotframework = 6.1
+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
+robotframework-lsp = 1.10.1
 robotframework-assertion-engine = 1.0.0
 robotframework-browser = 16.2.0
 robotframework-debuglibrary = 2.3.0