diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
index ac3253c49c..17ff77c723 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
+++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
@@ -652,6 +652,8 @@ public class BaseRMRestTest extends RestTest
                     this.wait(waitInMilliSeconds);
                 } catch (InterruptedException e)
                 {
+                    // Restore interrupted state...
+                    Thread.currentThread().interrupt();
                 }
             }
 
@@ -703,6 +705,8 @@ public class BaseRMRestTest extends RestTest
                 }
                 catch (InterruptedException e)
                 {
+                    // Restore interrupted state...
+                    Thread.currentThread().interrupt();
                 }
             }
 
@@ -752,6 +756,8 @@ public class BaseRMRestTest extends RestTest
                 }
                 catch (InterruptedException e)
                 {
+                    // Restore interrupted state...
+                    Thread.currentThread().interrupt();
                 }
             }
             result = searchApi.searchForNodePropertyAsUser(user.getUsername(), user.getPassword(), nodeRef,