diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 5aa2c49..359ce88 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -1,5 +1,4 @@
 name: PHP Composer
-
 on:
   push:
     branches:
@@ -14,13 +13,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP Action
+      uses: shivammathur/setup-php@2.9.0
+      with:
+        php-version: '7.4'
 
     - name: Validate composer.json and composer.lock
       run: composer validate
 
-    # - name: Install dependencies
-      # run: composer install --prefer-dist --no-progress --no-suggest
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress --no-suggest
 
-    # - name: Run test suite
-      # run: vendor/bin/phpunit
+    - name: Run test suite
+      run: vendor/bin/phpunit
diff --git a/.github/workflows/php8.yml b/.github/workflows/php8.yml
new file mode 100644
index 0000000..fa2bf43
--- /dev/null
+++ b/.github/workflows/php8.yml
@@ -0,0 +1,31 @@
+name: PHP Composer
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP Action
+      uses: shivammathur/setup-php@2.9.0
+      with:
+        php-version: '8.0'
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress --no-suggest
+
+    - name: Run test suite
+      run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 6132e8e..ad78a3f 100644
--- a/composer.json
+++ b/composer.json
@@ -11,10 +11,8 @@
   ],
   "require": {
     "php": "~7.0|^8.0",
-    "8fold/php-shoop-shelf": "~0.8",
+    "8fold/php-shoop-shelf": "~0.8.4",
     "8fold/php-html-spec": "~0.0.3",
-    "8fold/commonmark-abbreviations": "~1.2",
-    "8fold/commonmark-accordions": "~1.0.4",
     "nesbot/carbon": "~2.5"
   },
   "require-dev": {