diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java
index 34f5b96ec3..8b9d808d53 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java
@@ -4,6 +4,7 @@ import org.apache.shiro.subject.Subject;
 import org.apache.shiro.subject.support.SubjectThreadState;
 import org.apache.shiro.util.ThreadContext;
 import org.apache.shiro.util.ThreadState;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mapstruct.factory.Mappers;
@@ -38,6 +39,11 @@ public class User2UserDtoMapperTest {
     ThreadContext.bind(subject);
   }
 
+  @After
+  public void unbindSubject() {
+    ThreadContext.unbindSubject();
+  }
+
   @Test
   public void shouldMapLinks_forUpdate() {
     User user = createDefaultUser();
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollection2DtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollection2DtoMapperTest.java
index 628e38f436..ec900dbaf6 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollection2DtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollection2DtoMapperTest.java
@@ -5,6 +5,7 @@ import org.apache.shiro.subject.Subject;
 import org.apache.shiro.subject.support.SubjectThreadState;
 import org.apache.shiro.util.ThreadContext;
 import org.apache.shiro.util.ThreadState;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import sonia.scm.PageResult;
@@ -42,6 +43,11 @@ public class UserCollection2DtoMapperTest {
     ThreadContext.bind(subject);
   }
 
+  @After
+  public void unbindSubject() {
+    ThreadContext.unbindSubject();
+  }
+
   @Test
   public void shouldSetPageNumber() {
     PageResult<User> pageResult = mockPageResult(true, "Hannes");