diff --git a/test/OLItest/TestRunner.py b/test/OLItest/TestRunner.py
index 828df59..f768018 100644
--- a/test/OLItest/TestRunner.py
+++ b/test/OLItest/TestRunner.py
@@ -159,7 +159,7 @@ class OLITestLib():
                 #folder = folder.replace(br'\"', b'"') # remove quoting
                 dirs.append(folder)
             # 2) filter out those not starting with INBOX.OLItest and del...
-            dirs = [d for d in dirs if d.startswith(b'INBOX.OLItest')]
+            dirs = [d for d in dirs if d.startswith(b'INBOX.OLItest') or d.startswith(b'INBOX/OLItest')]
             for folder in dirs:
                 res_t, data = imapobj.delete(b'\"'+folder+b'\"')
                 assert res_t == 'OK', "Folder deletion of {0} failed with error"\
diff --git a/test/OLItest/globals.py b/test/OLItest/globals.py
index 8e69ee8..ba072e2 100644
--- a/test/OLItest/globals.py
+++ b/test/OLItest/globals.py
@@ -38,5 +38,5 @@ localfolders =
 type=IMAP
 # Don't hammer the server with too many connection attempts:
 maxconnections=1
-folderfilter= lambda f: f.startswith('INBOX.OLItest')
+folderfilter= lambda f: f.startswith('INBOX.OLItest') or f.startswith('INBOX/OLItest')
 """)