diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml
index 8409c5f47..abedd1475 100644
--- a/.github/workflows/test_common.yml
+++ b/.github/workflows/test_common.yml
@@ -39,11 +39,10 @@ env:
 jobs:
   tests:
     name: tests
-    if: ${{ !inputs.fleet_tests || matrix.shard == 0 }}
     strategy:
       fail-fast: false
       matrix:
-        shard: [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+        shard: ${{ inputs.fleet_tests && fromJSON('[0]') || fromJSON('[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]') }}
     # total number of shards =18 means tests will split into 18 thread and run in parallel to increase execution speed
     # command for sharding :
     # pytest --shard-id=<shard_number> --num-shards=<total_shards>