diff --git a/cgroups/automated/run-test.sh b/cgroups/automated/run-test.sh
index c7e10cd955e8b0e2faa4bbc64f4c3cb4058eb678..5673bf037954d258ebf9f7c3e23e6a0f71c84448 100755
--- a/cgroups/automated/run-test.sh
+++ b/cgroups/automated/run-test.sh
@@ -142,6 +142,18 @@ _write_random_files() {
 
 # Setup for blkio tests
 _setup_blkio() {
+    root_partition="$(grep ' / ' /proc/self/mounts | cut -d' ' -f1 | grep -v '^rootfs$')"
+    root_drive="$(echo "${root_partition}" | sed -e 's,p\?[0-9]\+$,,')"
+    root_drive="${root_drive#/dev/}"
+    head -v /sys/block/${root_drive}/queue/scheduler 2>&1 | sed -e 's/^/# /'
+    case "$(cat /sys/block/${root_drive}/queue/scheduler)" in
+        (*\[cfq\]*)
+            ;;
+        (*)
+            echo "WARNING: Block device scheduler does not appear to be cfq."
+            echo "This is probably not going to work, but trying it anyway..."
+    esac
+
     _reset_cgroup blkio
     # Set the resource allocation proportion
     echo "# Configuring $MID_CG cgroup with blkio.weight = 1000"