diff --git a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java
index ecf079c29..dd674d3a3 100644
--- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java
+++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java
@@ -1021,8 +1021,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
     }
 
     private static class EventHandlerMock {
-        private final List<TargetAssignDistributionSetEvent> events = Collections
-                .synchronizedList(new LinkedList<TargetAssignDistributionSetEvent>());
+        private final List<TargetAssignDistributionSetEvent> events = Collections.synchronizedList(new LinkedList<>());
         private final CountDownLatch latch;
         private final int expectedNumberOfEvents;
 
@@ -1050,8 +1049,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
     }
 
     private static class CancelEventHandlerMock {
-        private final List<CancelTargetAssignmentEvent> events = Collections
-                .synchronizedList(new LinkedList<CancelTargetAssignmentEvent>());
+        private final List<CancelTargetAssignmentEvent> events = Collections.synchronizedList(new LinkedList<>());
         private final CountDownLatch latch;
         private final int expectedNumberOfEvents;
 
diff --git a/hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/controller/ArtifactDownloadTest.java b/hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/controller/ArtifactDownloadTest.java
index b49f34b5f..6149472a7 100644
--- a/hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/controller/ArtifactDownloadTest.java
+++ b/hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/controller/ArtifactDownloadTest.java
@@ -64,13 +64,11 @@ import ru.yandex.qatools.allure.annotations.Stories;
 @Stories("Artifact Download Resource")
 public class ArtifactDownloadTest extends AbstractIntegrationTestWithMongoDB {
 
-    private static final String AUTH_ANOYM = "ROLE_CONTROLLER_ANONYMOUS";
-
     public ArtifactDownloadTest() {
         LOG = LoggerFactory.getLogger(ArtifactDownloadTest.class);
     }
 
-    private int downLoadProgress = 0;
+    private volatile int downLoadProgress = 0;
 
     @Autowired
     private EventBus eventBus;
@@ -364,7 +362,7 @@ public class ArtifactDownloadTest extends AbstractIntegrationTestWithMongoDB {
         // create target
         Target target = new Target("4712");
         target = targetManagement.createTarget(target);
-        final List<Target> targets = new ArrayList();
+        final List<Target> targets = new ArrayList<>();
         targets.add(target);
 
         // create ds