diff --git a/Makefile.am b/Makefile.am
index 98b7cb48bc8a16e7bdabc10ae45e873c6b72bbb2..ee1d1c42330aafd2f194013c26ee6d35fe6ca209 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1022,6 +1022,7 @@ TEST_FILES = \
 	test/data/htools/invalid-node.data \
 	test/data/htools/missing-resources.data \
 	test/data/htools/multiple-master.data \
+	test/data/htools/multiple-tags.data \
 	test/data/htools/n1-failure.data \
 	test/data/htools/rapi/groups.json \
 	test/data/htools/rapi/info.json \
diff --git a/test/data/htools/multiple-tags.data b/test/data/htools/multiple-tags.data
new file mode 100644
index 0000000000000000000000000000000000000000..35cb17ac2efb55478a49579f88f995c986bc9fee
--- /dev/null
+++ b/test/data/htools/multiple-tags.data
@@ -0,0 +1,16 @@
+group-01|fake-uuid-01|preferred|
+
+node-01-001|91552|0|91424|953674|953674|16|M|fake-uuid-01|1|red
+node-01-002|91552|0|91296|953674|953674|16|N|fake-uuid-01|1|blue
+node-01-003|91552|0|91296|953674|953674|16|N|fake-uuid-01|1|
+node-01-004|91552|0|91296|953674|953674|16|N|fake-uuid-01|1|blue,red
+node-01-005|91552|0|91296|953674|953674|16|N|fake-uuid-01|1|red
+node-01-006|91552|0|91296|953674|953674|16|N|fake-uuid-01|1|blue
+
+new-0|128|1152|1|running|Y|node-01-001|node-01-002|drbd||1
+new-1|128|1152|1|running|Y|node-01-003|node-01-004|drbd||1
+new-1|128|1152|1|running|Y|node-01-005|node-01-006|drbd||1
+
+
+|128,1,1024,1,1,1|128,1,1024,1,1,1;32768,8,1048576,16,8,12|diskless,file,sharedfile,plain,blockdev,drbd,rbd,ext|4.0|32.0
+group-01|128,1,1024,1,1,1|128,1,1024,1,1,1;32768,8,1048576,16,8,12|diskless,file,sharedfile,plain,blockdev,drbd,rbd,ext|4.0|32.0
diff --git a/test/hs/shelltests/htools-hroller.test b/test/hs/shelltests/htools-hroller.test
index 82ad782c4b57b9656b8e8af114efb8dca0a63de5..925ff9d72be388227bba67c3ccbcf03c3ee3f26b 100644
--- a/test/hs/shelltests/htools-hroller.test
+++ b/test/hs/shelltests/htools-hroller.test
@@ -14,3 +14,11 @@ node-01-003,node-01-001
 node-01-002
 node-01-001
 >>>= 0
+
+./test/hs/hroller --node-tags=red --no-headers -t $TESTDATA_DIR/multiple-tags.data
+>>>/node-01-00.,node-01-00.,node-01-001/
+>>>= 0
+
+./test/hs/hroller --node-tags=blue --no-headers -t $TESTDATA_DIR/multiple-tags.data
+>>>/node-01-00.,node-01-00.,node-01-00?/
+>>>= 0