diff --git a/tests/robot/Lib/pgsLibrary.py b/tests/robot/Lib/pgsLibrary.py
index 15888d8a..4ee9ab57 100644
--- a/tests/robot/Lib/pgsLibrary.py
+++ b/tests/robot/Lib/pgsLibrary.py
@@ -646,7 +646,10 @@ def get_backup_count(self):
 
     def detect_pg_version_and_storage_path(self):
         pg_ver = self.get_pg_version()
-        if pg_ver >= 17:
+        if pg_ver >= 18:
+            logging.info("Using pgsql 18 storage")
+            backup_dir = '/backup-storage/pg18'
+        elif pg_ver >= 17:
             logging.info("Using pgsql 17 storage")
             backup_dir = '/backup-storage/pg17'
         elif pg_ver >= 16: