diff --git a/buildout.cfg b/buildout.cfg
index c70a9f5..94ea19a 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,112 +1,3 @@
 [buildout]
-index = https://pypi.org/simple/
-extends = https://dist.plone.org/release/5.2-latest/versions.cfg
-find-links =
-    https://dist.plone.org/release/5.2-latest/
-    https://dist.plone.org/thirdparty/
-
-parts =
-    instance
-    i18ndude
-    test
-    omelette
-    i18ndude
-    zopepy
-    update_translations
-    write_code_headers
-    update_sources
-
-eggs =
-    senaite.core
-    senaite.app.listing
-    senaite.app.spotlight
-    senaite.app.supermodel
-    senaite.databox
-    senaite.impress
-    senaite.jsonapi
-    senaite.lims
-    plone.reload
-    Products.PrintingMailHost
-
-extensions = mr.developer
-
+extends = https://raw.githubusercontent.com/senaite/senaite.core/2.x/buildout.base.cfg
 package-name = senaite.databox
-
-versions = versions
-show-picked-versions = true
-
-plone-user = admin:admin
-
-develop = .
-sources = sources
-auto-checkout = *
-
-[sources]
-senaite.core = git https://github.com/senaite/senaite.core.git pushurl=git@github.com:senaite/senaite.core.git branch=2.x
-senaite.app.listing = git https://github.com/senaite/senaite.app.listing.git pushurl=git@github.com:senaite/senaite.app.listing.git branch=2.x
-senaite.app.spotlight = git https://github.com/senaite/senaite.app.spotlight.git pushurl=git@github.com:senaite/senaite.app.spotlight.git branch=2.x
-senaite.app.supermodel = git https://github.com/senaite/senaite.app.supermodel.git pushurl=git@github.com:senaite/senaite.app.supermodel.git branch=2.x
-senaite.impress = git https://github.com/senaite/senaite.impress.git pushurl=git@github.com:senaite/senaite.impress.git branch=2.x
-senaite.jsonapi = git https://github.com/senaite/senaite.jsonapi.git pushurl=git@github.com:senaite/senaite.jsonapi.git branch=2.x
-senaite.lims = git https://github.com/senaite/senaite.lims.git pushurl=git@github.com:senaite/senaite.lims.git branch=2.x
-
-[instance]
-recipe = plone.recipe.zope2instance
-http-address = 127.0.0.1:8080
-user = ${buildout:plone-user}
-wsgi = on
-eggs =
-    Plone[archetypes]
-    plone.app.upgrade
-    ${buildout:package-name}
-    ${buildout:eggs}
-deprecation-warnings = on
-environment-vars =
-    zope_i18n_compile_mo_files true
-resources = ${buildout:directory}/resources
-zcml =
-
-[i18ndude]
-unzip = true
-recipe = zc.recipe.egg
-eggs = i18ndude
-
-[test]
-recipe = zc.recipe.testrunner
-defaults = ['--auto-color', '--auto-progress']
-eggs =
-    senaite.databox [test]
-
-[omelette]
-recipe = collective.recipe.omelette
-eggs = ${buildout:eggs}
-
-[zopepy]
-recipe = zc.recipe.egg
-eggs = ${instance:eggs}
-interpreter = zopepy
-scripts = zopepy
-
-[update_translations]
-recipe = collective.recipe.template
-output = ${buildout:directory}/bin/update_translations
-input = ${buildout:directory}/templates/update_translations.in
-mode = 755
-
-[write_code_headers]
-recipe = collective.recipe.template
-output = ${buildout:directory}/bin/write_code_headers
-input = ${buildout:directory}/templates/write_code_headers.py.in
-mode = 755
-
-[update_sources]
-recipe = collective.recipe.template
-output = ${buildout:directory}/bin/update_sources
-input = ${buildout:directory}/templates/update_sources.in
-mode = 755
-
-[versions]
-# versions need to match the versions in requirements.txt
-# https://github.com/collective/buildout.plonetest/#testing-in-travis-ci-with-multiple-versions-of-plone-and-python
-setuptools = 44.1.1
-zc.buildout = 2.13.3
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
index 7a32652..d6dac26 100644
--- a/docs/Changelog.rst
+++ b/docs/Changelog.rst
@@ -1,6 +1,7 @@
 1.5.0 (unreleased)
 ------------------
 
+- #36 Compatibility with core#2567 (AnalysisCategory to DX)
 - #33 Fix date issues when user inputs: date out of bound or date_to earlier than date_from
 - #35 Allow to query Auto Import Log type
 
diff --git a/src/senaite/databox/tests/doctests/Databox.rst b/src/senaite/databox/tests/doctests/Databox.rst
index a4c8e54..2dedcbd 100644
--- a/src/senaite/databox/tests/doctests/Databox.rst
+++ b/src/senaite/databox/tests/doctests/Databox.rst
@@ -41,7 +41,7 @@ Setup the testing environment:
     >>> date_future = (DateTime() + 5).strftime("%Y-%m-%d")
     >>> analysisservices = bikasetup.bika_analysisservices
     >>> labcontacts = bikasetup.bika_labcontacts
-    >>> analysiscategories = bikasetup.bika_analysiscategories
+    >>> analysiscategories = setup.analysiscategories
 
 Functional Helpers: