diff --git a/test/lib/library.exp b/test/lib/library.exp
index 4ca6b96c..05259d30 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -383,7 +383,8 @@ proc match_items {items test {size 20}} {
         }; # for
         if {[llength $items] == 1} {
             expect {
-                -re "^$expected$" { set result true }
+                # NOTE: The optional space ( ?) depends on whether -o nospace is active
+                -re "^$expected ?$" { set result true }
                 "\r\n" { set result false; break }
                 default { set result false; break }
                 timeout { set result false; break }