diff --git a/.github/workflows/compose.yml b/.github/workflows/compose.yml
index aa01a4c38d..483298d90b 100644
--- a/.github/workflows/compose.yml
+++ b/.github/workflows/compose.yml
@@ -15,6 +15,8 @@ on:
         type: number
       part:
         type: number
+      storage:
+        type: string
 
 jobs:
   compose:
@@ -35,6 +37,7 @@ jobs:
           REVAD_IMAGE: ${{ inputs.image }}
           PARTS: ${{ inputs.parts }}
           PART: ${{ inputs.part }}
+          STORAGE_DRIVER: ${{ inputs.storage }}
       - name: Clean
         if: always()
         run: make docker-clean
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 33abc742db..3f6efb029f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -83,16 +83,23 @@ jobs:
       fail-fast: false
       matrix:
         test: [litmus-1, litmus-2]
+        storage: ["eosclient"]
     uses: ./.github/workflows/compose.yml
     with:
       test: ${{ matrix.test }}
+      storage: ${{ matrix.storage }}
   acceptance-1:
     needs:
       - docker-revad-eos
+    strategy:
+      fail-fast: false
+      matrix:
+        storage: ["eosclient"]
     uses: ./.github/workflows/compose.yml
     with:
       test: acceptance-1
       submodules: true
+      storage: ${{ matrix.storage }}
   acceptance-2:
     needs:
       - docker-revad-eos
@@ -100,9 +107,11 @@ jobs:
       fail-fast: false
       matrix:
         part: [1, 2, 3, 4, 5, 6]
+        storage: ["eosclient"]
     uses: ./.github/workflows/compose.yml
     with:
       test: acceptance-2
       submodules: true
       parts: 6
       part: ${{ matrix.part }}
+      storage: ${{ matrix.storage }}
diff --git a/Makefile b/Makefile
index 626c7fb6ec..441f12550b 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,7 @@ export REVAD_IMAGE	  ?= revad-eos
 export EOS_FULL_IMAGE ?= eos-full
 export PARTS		  ?= 1
 export PART			  ?= 1
+export STORAGE_DRIVER ?= eosclient
 
 .PHONY: $(TEST)
 $(TEST): docker-eos-full-tests docker-revad-eos
diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml
index dafc258fd5..2b766476fe 100644
--- a/tests/docker/docker-compose.yml
+++ b/tests/docker/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     volumes:
       - ./eos-storage/scripts:/scripts
     environment:
-      INIT_SCRIPT: /scripts/eosbinary-init.sh
+      INIT_SCRIPT: /scripts/${STORAGE_DRIVER}-init.sh
   litmus:
     image: registry.cern.ch/docker.io/owncloud/litmus:latest
     environment:
diff --git a/tests/docker/eos-storage/scripts/eosbinary-init.sh b/tests/docker/eos-storage/scripts/eosclient-init.sh
similarity index 100%
rename from tests/docker/eos-storage/scripts/eosbinary-init.sh
rename to tests/docker/eos-storage/scripts/eosclient-init.sh