diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
index cb84b85f..8eb64934 100644
--- a/.github/workflows/Tests.yml
+++ b/.github/workflows/Tests.yml
@@ -27,6 +27,11 @@ jobs:
                     php-version: ${{ matrix.php-versions }}
                     ini-values: memory_limit=1G
 
+            -   name: If PHP 8.0 is used, adapt composer.json
+                run: |
+                    chmod +x test/adjust_composer_for_php80.sh
+                    ./test/adjust_composer_for_php80.sh
+
             -   name: Install Composer dependencies
                 run: composer update --no-progress --no-suggest --prefer-dist --optimize-autoloader
 
@@ -63,6 +68,10 @@ jobs:
                     php-version: ${{ matrix.php-versions }}
                     ini-values: memory_limit=1G
 
+            -   name: Run batch script
+                run: test\adjust_composer_for_php80.bat
+                shell: cmd
+
             -   name: Install Composer dependencies
                 run: composer update --no-progress --no-suggest --prefer-dist --optimize-autoloader
 
diff --git a/composer.json b/composer.json
index 7cc44be0..f366028e 100644
--- a/composer.json
+++ b/composer.json
@@ -36,18 +36,14 @@
         "lib-libxml" : "*",
         "sweetrdf/rdf-helpers": "^2.0"
     },
-    "suggest": {
-        "ml/json-ld": "^1.0",
-        "semsol/arc2": "^3"
-    },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
-        "ml/json-ld": "^1.0",
+        "laminas/laminas-http": "^2",
         "phpunit/phpunit": "^9.5.0|^10.0.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "semsol/arc2": "^3",
-        "laminas/laminas-http": "^2"
+        "sweetrdf/json-ld": "^1.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/test/adjust_composer_for_php80.bat b/test/adjust_composer_for_php80.bat
new file mode 100644
index 00000000..4b37e3e4
--- /dev/null
+++ b/test/adjust_composer_for_php80.bat
@@ -0,0 +1,13 @@
+@echo off
+setlocal enabledelayedexpansion
+
+for /f "delims=" %%v in ('php -r "echo PHP_VERSION;"') do set "PHP_VERSION=%%v"
+
+if "%PHP_VERSION:~0,3%"=="8.0" (
+    echo PHP 8.0 found adapt composer.json ...
+
+    powershell -NoProfile -Command ^
+      "(Get-Content composer.json) -replace '\"sweetrdf/json-ld\":.*', '\"ml/json-ld\": \"^1.2\"' | Set-Content composer.json"
+
+    echo composer.json adapted
+)
diff --git a/test/adjust_composer_for_php80.sh b/test/adjust_composer_for_php80.sh
new file mode 100644
index 00000000..3988ab47
--- /dev/null
+++ b/test/adjust_composer_for_php80.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [[ "$(php -r 'echo PHP_VERSION;')" == 8.0* ]]; then
+    echo "PHP 8.0 found adapt composer.json ..."
+
+    sed -i 's/"sweetrdf\/json-ld":.*/"ml\/json-ld": "^1.2"/' composer.json
+
+    echo "composer.json adapted"
+fi