diff --git a/hawkbit-cache-redis/src/test/java/org/eclipse/hawkbit/cache/eventbus/EventDistributorTest.java b/hawkbit-cache-redis/src/test/java/org/eclipse/hawkbit/cache/eventbus/EventDistributorTest.java
index fb657638e..c1ff54961 100644
--- a/hawkbit-cache-redis/src/test/java/org/eclipse/hawkbit/cache/eventbus/EventDistributorTest.java
+++ b/hawkbit-cache-redis/src/test/java/org/eclipse/hawkbit/cache/eventbus/EventDistributorTest.java
@@ -35,6 +35,7 @@ import ru.yandex.qatools.allure.annotations.Stories;
 @Features("Unit Tests - Cluster Cache")
 @Stories("EventDistributor Test")
 @RunWith(MockitoJUnitRunner.class)
+// TODO: create description annotations
 public class EventDistributorTest {
 
     @Mock
diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/eventbus/EventBusSubscriberProcessorTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/eventbus/EventBusSubscriberProcessorTest.java
index 2925ba878..548bf7e7e 100644
--- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/eventbus/EventBusSubscriberProcessorTest.java
+++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/eventbus/EventBusSubscriberProcessorTest.java
@@ -27,6 +27,7 @@ import ru.yandex.qatools.allure.annotations.Stories;
 @Features("Unit Tests - Cluster Event Bus")
 @Stories("EventBus Subscriber Processor Test")
 @RunWith(MockitoJUnitRunner.class)
+// TODO: create description annotations
 public class EventBusSubscriberProcessorTest {
 
     @Mock
diff --git a/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java b/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java
index a5b02ffb1..fb961f9b2 100644
--- a/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java
+++ b/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java
@@ -26,6 +26,7 @@ import ru.yandex.qatools.allure.annotations.Stories;
 @Features("Unit Tests - Security")
 @Stories("PreAuthToken Source TrustAuthentication Provider Test")
 @RunWith(MockitoJUnitRunner.class)
+// TODO: create description annotations
 public class PreAuthTokenSourceTrustAuthenticationProviderTest {
 
     private static final String REQUEST_SOURCE_IP = "127.0.0.1";
diff --git a/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/security/SecurityTokenGeneratorTest.java b/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/security/SecurityTokenGeneratorTest.java
index 9228e700c..b83b81df7 100644
--- a/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/security/SecurityTokenGeneratorTest.java
+++ b/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/security/SecurityTokenGeneratorTest.java
@@ -20,6 +20,7 @@ import ru.yandex.qatools.allure.annotations.Stories;
 @Stories("SecurityToken Generator Test")
 public class SecurityTokenGeneratorTest {
 
+    // FIXME: figure what is this all about??
     @Test
     public void test() throws NoSuchAlgorithmException, UnsupportedEncodingException {
         final SecurityTokenGenerator securityTokenGenerator = new SecurityTokenGenerator();
diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/push/SpringSecurityAtmosphereInterceptorTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/push/SpringSecurityAtmosphereInterceptorTest.java
index 84b48a004..bcf0dcf72 100644
--- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/push/SpringSecurityAtmosphereInterceptorTest.java
+++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/push/SpringSecurityAtmosphereInterceptorTest.java
@@ -25,7 +25,13 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
 
+import ru.yandex.qatools.allure.annotations.Features;
+import ru.yandex.qatools.allure.annotations.Stories;
+
+@Features("Unit Tests - Management UI")
+@Stories("Push Security")
 @RunWith(MockitoJUnitRunner.class)
+// TODO: create description annotations
 public class SpringSecurityAtmosphereInterceptorTest {
 
     @Mock
diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/NamingThreadFactoryTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/NamingThreadFactoryTest.java
index 1ff1b3d33..d91d4cba2 100644
--- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/NamingThreadFactoryTest.java
+++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/NamingThreadFactoryTest.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Description;
 import ru.yandex.qatools.allure.annotations.Features;
 import ru.yandex.qatools.allure.annotations.Stories;
 
-@Features("Component Tests - UI")
+@Features("Unit Tests - Management UI")
 @Stories("Threads with NamingThreadFactory")
 @RunWith(MockitoJUnitRunner.class)
 public class NamingThreadFactoryTest {
diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java
index 1f4798ad5..f818bc15d 100644
--- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java
+++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java
@@ -19,12 +19,15 @@ import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
 
+import ru.yandex.qatools.allure.annotations.Features;
+import ru.yandex.qatools.allure.annotations.Stories;
+
 /**
  * Unit Test block for UI Component provider. Dynamic Factory Testing.
  * 
- *
- *
  */
+@Features("Unit Tests - Management UI")
+@Stories("UI components")
 public class SPUIComponentProviderTest {
     /**
      * Test case for check button factory.