diff --git a/pom.xml b/pom.xml
index 23ea8daf86..e822496ea0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,20 +138,6 @@
       <scope>test</scope>
     </dependency>
     
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 
   <build>
@@ -439,7 +425,6 @@
     <mokito.version>1.9.5</mokito.version>
     <hamcrest.version>1.3</hamcrest.version>
     <junit.version>4.11</junit.version>
-    <powermock.version>1.5.3</powermock.version>
 
     <!-- logging libraries -->
     <slf4j.version>1.7.7</slf4j.version>
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
index e0c67da45a..94c9c2b4df 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
@@ -35,16 +35,16 @@ package sonia.scm.repository;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import com.google.common.collect.ImmutableSet;
 
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.junit.Test;
 
 import sonia.scm.Type;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.repository.api.HookContext;
+import sonia.scm.repository.api.HookContextFactory;
 import sonia.scm.repository.api.HookFeature;
+import sonia.scm.repository.spi.HookContextProvider;
 import sonia.scm.repository.xml.XmlRepositoryDAO;
 import sonia.scm.security.DefaultKeyGenerator;
 import sonia.scm.store.JAXBStoreFactory;
@@ -65,8 +65,6 @@ import java.util.Set;
  *
  * @author Sebastian Sdorra
  */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(HookContext.class)
 public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
 {
 
@@ -81,12 +79,13 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
   @Override
   public HookContext createHookContext(Repository repository)
   {
-    HookContext ctx = mock(HookContext.class);
+    PreProcessorUtil ppu = mock(PreProcessorUtil.class);
+    HookContextProvider provider = mock(HookContextProvider.class);
+    Set<HookFeature> features = ImmutableSet.of();
 
-    when(ctx.isFeatureSupported(any(HookFeature.class))).thenReturn(
-      Boolean.FALSE);
+    when(provider.getSupportedFeatures()).thenReturn(features);
 
-    return ctx;
+    return new HookContextFactory(ppu).createContext(provider, repository);
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -145,7 +144,7 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
   protected DefaultRepositoryManager createRepositoryManager(
     boolean archiveEnabled)
   {
-    Set<RepositoryHandler> handlerSet = new HashSet<RepositoryHandler>();
+    Set<RepositoryHandler> handlerSet = new HashSet<>();
     StoreFactory factory = new JAXBStoreFactory();
 
     factory.init(contextProvider);