diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37632bb9..d5754991 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,11 +58,9 @@ stages:
     - nproc=`grep -c '^processor' /proc/cpuinfo` || nproc=1
     - echo nproc=$nproc
     - make -j $nproc
-    # Exclude specific unit test which fails without /dev/disk in Docker images.
-    - export GTEST_FILTER='-BlockSpecialTest.NamedBlockSpecialObjectBySymlinkMatches'
     # Exclude specific unit tests which fail without being able to create
     # loop devices in Docker images.
-    - GTEST_FILTER+=':My/SupportedFileSystemsTest.Create/lvm2pv'
+    - export GTEST_FILTER='-My/SupportedFileSystemsTest.Create/lvm2pv'
     - GTEST_FILTER+=':My/SupportedFileSystemsTest.CreateAndReadUsage/btrfs'
     - GTEST_FILTER+=':My/SupportedFileSystemsTest.CreateAndReadUsage/lvm2pv'
     - GTEST_FILTER+=':My/SupportedFileSystemsTest.CreateAndReadUsage/nilfs2'
diff --git a/tests/makedev.sh b/tests/makedev.sh
index 3c4166ea..735d407d 100755
--- a/tests/makedev.sh
+++ b/tests/makedev.sh
@@ -22,3 +22,12 @@ do
 		chown root:disk "$name"
 	fi
 done
+
+# Create /dev/disk/by-id/SYMLINK to first block special device named in
+# /proc/partitions, if directory doesn't already exist, for
+# test_BlockSpecial.
+if test ! -e /dev/disk/by-id; then
+	mkdir -v -m 0755 -p /dev/disk/by-id/
+	dev=`awk '$1=="major" {next} NF==4 {print $4; exit}' /proc/partitions`
+	ln -v -s "/dev/$dev" "/dev/disk/by-id/gparted-$dev"
+fi