diff --git a/test/sharness/t0025-datastores.sh b/test/sharness/t0025-datastores.sh
index a0b5307b1b1..6be9eb3ed48 100755
--- a/test/sharness/t0025-datastores.sh
+++ b/test/sharness/t0025-datastores.sh
@@ -4,13 +4,20 @@ test_description="Test non-standard datastores"
 
 . lib/test-lib.sh
 
-test_expect_success "'ipfs init --empty-repo=false --profile=pebbleds' succeeds" '
-  BITS="2048" &&
-  ipfs init --empty-repo=false --profile=pebbleds
-'
+profiles=("flatfs" "pebbleds" "badgerds")
+proot="$(mktemp -d "${TMPDIR:-/tmp}/t0025.XXXXXX")"
 
-test_expect_success "'ipfs pin ls' works" '
-  ipfs pin ls | wc -l | grep 9
-'
+for profile in "${profiles[@]}"; do
+    test_expect_success "'ipfs init --empty-repo=false --profile=$profile' succeeds" '
+        BITS="2048" &&
+        IPFS_PATH="$proot/$profile" &&
+        ipfs init --empty-repo=false --profile=$profile
+    '
+    test_expect_success "'ipfs pin add' and 'pin ls' works with $profile" '
+        export IPFS_PATH="$proot/$profile" &&
+        echo -n "hello_$profile" | ipfs block put --pin=true > hello_cid &&
+        ipfs pin ls -t recursive "$(cat hello_cid)"
+    '
+done
 
 test_done