diff --git a/.github/workflows/dieharder.yml b/.github/workflows/dieharder.yml
new file mode 100644
index 0000000..529aa79
--- /dev/null
+++ b/.github/workflows/dieharder.yml
@@ -0,0 +1,30 @@
+name: Dieharder CI
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    
+    container:
+      image: erlang:26
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Install dependencies
+      run:  |
+            sed -i "/^# deb.*universe/ s/^# //" /etc/apt/sources.list
+            apt update
+            apt -y install libgsl-dev
+    - name: Install dieharder
+      run: |
+           export DIEHARDER_SHA=fe552eab52b1f9aaff282844abf37cffebaff0e9
+           curl -fSL -o $DIEHARDER_SHA.zip https://github.com/eddelbuettel/dieharder/archive/$DIEHARDER_SHA.zip
+           unzip $DIEHARDER_SHA.zip
+           cd dieharder-$DIEHARDER_SHA
+           ./autogen.sh
+           ./configure --prefix=$GITHUB_WORKSPACE
+           make
+           make install
+    - name: Run dieharder
+      run:  |
+            PATH=$PATH:$GITHUB_WORKSPACE/bin
+            ./dieharder.sh
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
index 2c68ad9..8440e3d 100644
--- a/.github/workflows/erlang.yml
+++ b/.github/workflows/erlang.yml
@@ -5,7 +5,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        erlang: [23, 24, 25, 26]
+        erlang: [24, 25, 26]
+        implementation: [rdrand, xorshift, pcg32]
 
     container:
       image: erlang:${{ matrix.erlang }}
@@ -17,21 +18,9 @@ jobs:
             sed -i "/^# deb.*universe/ s/^# //" /etc/apt/sources.list
             apt update
             apt -y install libgsl-dev
-    - name: Install dieharder
-      run: |
-           export DIEHARDER_SHA=fe552eab52b1f9aaff282844abf37cffebaff0e9
-           wget --no-check-certificate https://github.com/eddelbuettel/dieharder/archive/$DIEHARDER_SHA.zip
-           unzip $DIEHARDER_SHA.zip
-           cd dieharder-$DIEHARDER_SHA
-           ./autogen.sh
-           ./configure --prefix=$GITHUB_WORKSPACE
-           make
-           make install
     - name: Compile
       run:  rebar3 as test compile
+      env: 
+        IMPLEMENTATION: ${{ matrix.implementation }}
     - name: Run tests
       run:  rebar3 as test proper
-    - name: Run dieharder
-      run:  |
-            PATH=$PATH:$GITHUB_WORKSPACE/bin
-            ./dieharder.sh