diff --git a/plugin-core/src/main/java/org/synyx/plugin/core/PluginRegistry.java b/plugin-core/src/main/java/org/synyx/plugin/core/PluginRegistry.java
index 211cfda..5dcbd83 100644
--- a/plugin-core/src/main/java/org/synyx/plugin/core/PluginRegistry.java
+++ b/plugin-core/src/main/java/org/synyx/plugin/core/PluginRegistry.java
@@ -20,7 +20,7 @@ public class PluginRegistry<T extends Plugin<S>, S> implements Iterable<T> {
 
 
     /**
-     * Constructor of {@code PluginRegistry}.
+     * Creates a new {@code PluginRegistry}.
      */
     public PluginRegistry() {
 
@@ -28,6 +28,19 @@ public class PluginRegistry<T extends Plugin<S>, S> implements Iterable<T> {
     }
 
 
+    /**
+     * Creates a new {@link PluginRegistry}.
+     * 
+     * @param <T>
+     * @param <S>
+     * @return
+     */
+    public static <T extends Plugin<S>, S> PluginRegistry<T, S> create() {
+
+        return new PluginRegistry<T, S>();
+    }
+
+
     /**
      * Register plugins.
      * 
diff --git a/plugin-core/src/test/java/org/synyx/plugin/core/PluginRegistryUnitTest.java b/plugin-core/src/test/java/org/synyx/plugin/core/PluginRegistryUnitTest.java
index 45dfcba..4da0ae1 100644
--- a/plugin-core/src/test/java/org/synyx/plugin/core/PluginRegistryUnitTest.java
+++ b/plugin-core/src/test/java/org/synyx/plugin/core/PluginRegistryUnitTest.java
@@ -8,6 +8,11 @@ import org.junit.Before;
 import org.junit.Test;
 
 
+/**
+ * Unit test for {@link PluginRegistry}.
+ * 
+ * @author Oliver Gierke - gierke@synyx.de
+ */
 public class PluginRegistryUnitTest {
 
     private SamplePlugin provider;
@@ -24,7 +29,7 @@ public class PluginRegistryUnitTest {
 
         provider = new SamplePluginImplementation();
 
-        registry = new PluginRegistry<SamplePlugin, String>();
+        registry = PluginRegistry.create();
         registry.setPlugins(Arrays.asList(provider));
     }
 
diff --git a/plugin-core/src/test/java/org/synyx/plugin/core/config/PluginConfigurationIntegrationTest.java b/plugin-core/src/test/java/org/synyx/plugin/core/config/PluginConfigurationIntegrationTest.java
index 4b68b2a..0d9eceb 100644
--- a/plugin-core/src/test/java/org/synyx/plugin/core/config/PluginConfigurationIntegrationTest.java
+++ b/plugin-core/src/test/java/org/synyx/plugin/core/config/PluginConfigurationIntegrationTest.java
@@ -12,6 +12,8 @@ import org.synyx.plugin.core.SamplePlugin;
 
 
 /**
+ * Integration test to simply check if the configuration gets parsed correctly.
+ * 
  * @author Oliver Gierke - gierke@synyx.de
  */
 @RunWith(SpringJUnit4ClassRunner.class)