diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh
index f334165f5c..b23864e5f0 100755
--- a/test/blobfs/rocksdb/rocksdb.sh
+++ b/test/blobfs/rocksdb/rocksdb.sh
@@ -66,8 +66,10 @@ fi
 
 EXTRA_CXXFLAGS=""
 GCC_VERSION=$(cc -dumpversion | cut -d. -f1)
-if ((GCC_VERSION >= 9)); then
+if ((GCC_VERSION >= 9)) && ((GCC_VERSION < 11)); then
 	EXTRA_CXXFLAGS+="-Wno-deprecated-copy -Wno-pessimizing-move -Wno-error=stringop-truncation"
+elif ((GCC_VERSION >= 11)); then
+	EXTRA_CXXFLAGS+="-Wno-error=range-loop-construct"
 fi
 
 $MAKE db_bench $MAKEFLAGS $MAKECONFIG DEBUG_LEVEL=0 SPDK_DIR=../spdk EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS"
diff --git a/test/blobfs/rocksdb/rocksdb_commit_id b/test/blobfs/rocksdb/rocksdb_commit_id
index efac5a55d2..ea0c6cf538 100644
--- a/test/blobfs/rocksdb/rocksdb_commit_id
+++ b/test/blobfs/rocksdb/rocksdb_commit_id
@@ -1 +1 @@
-526c73bd94150cc8fbd651f736e1ca95f50d8e13
+1f80f5b2c74353608614157992f5c3915d972d75