diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc0a1f73f785b3e01a2361f762ef14010eb81577..0e953065ab3a6359f47a101b64e324fee59c16eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,9 +139,8 @@ unittest_py38:
   stage: unittest
   image: python:3.8
   script: &python_test_script
-    - pip install pynose pandas
     - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
-    - pip install .[test,h5-crawler,gitignore-parser]
+    - pip install .[all]
     - pytest --cov=caosadvancedtools unittests
 
 unittest_py310:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa1511c8bd31e1aa87afca3b4fd408f262d7ed04..18647b8853a10260dbd9e7c6d5fd73100e70b7ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added ###
 
 * Official support for Python 3.13
-* New setup extras `test` and `doc` which install the dependencies for testing and documentation.
 
 ### Changed ###
 
@@ -17,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   following exposed names / features:
   - `models.data_model.LINKAHEAD_INTERNAL_PROPERTIES`
   - `export_related.export` exports to `linkahead_data.xml` now.
+- Renamed (and added) installation "extra" options:
+  - `h5` instead of `h5-crawler`
+  - `doc`, `test` and `all` are new, they install the dependencies for testing, documentation and
+    everything.
 
 ### Deprecated ###
 
diff --git a/setup.py b/setup.py
index 08908baac0211690f9298a71b23ca91aa6ebc0c1..747324fbfa5d2748e5703d58665cf366ab242c60 100755
--- a/setup.py
+++ b/setup.py
@@ -163,7 +163,7 @@ def setup_package():
                           "pandas>=1.2.0",
                           "xlrd>=2.0",
                           ],
-        extras_require={"h5-crawler": ["h5py>=3.3.0", ],
+        extras_require={"h5": ["h5py>=3.3.0", ],
                         "gitignore-parser": ["gitignore-parser >=0.1.0", ],
                         "doc": [
                             "sphinx",
@@ -171,13 +171,16 @@ def setup_package():
                             "sphinx-rtd-theme",
                             "recommonmark >= 0.6.0",
                         ],
-                        "test": [
-                            "gitignore-parser",
+                        "test": [  # include: h5, gitignore-parser
                             "pytest",
                             "pytest-pythonpath",
                             "pytest-cov",
                             "coverage>=4.4.2",
+                            "caosadvancedtools[h5, gitignore-parser]",
                         ],
+                        "all": [  # include: doc, test
+                            "caosadvancedtools[doc, test]",
+                        ]
                         },
         setup_requires=["pytest-runner>=2.0,<3dev"],
         packages=find_packages('src'),
diff --git a/tox.ini b/tox.ini
index a7e06bf51f1f4cad2a2c695e44d3a4d09020b2a3..12c7ad50efc4642d290f30aa27b7cb48370db05b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,12 @@
 [tox]
-envlist=py38, py39, py310, py311, py312, py313
+envlist = py38, py39, py310, py311, py312, py313
 skip_missing_interpreters = true
 
 [testenv]
-deps=nose
-    pandas
+deps =
     git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
-    pytest
-    pytest-cov
-    gitignore-parser
-    openpyxl >= 3.0.7
-    xlrd == 1.2
-    h5py
-commands=py.test --cov=caosadvancedtools --cov-report=html:.tox/cov_html -vv {posargs}
+extras = test
+commands = py.test --cov=caosadvancedtools --cov-report=html:.tox/cov_html -vv {posargs}
 
 [flake8]
 max-line-length=100