diff --git a/scm-core/src/main/java/sonia/scm/net/HttpClient.java b/scm-core/src/main/java/sonia/scm/net/HttpClient.java
index b9b891f557..6af89bcb71 100644
--- a/scm-core/src/main/java/sonia/scm/net/HttpClient.java
+++ b/scm-core/src/main/java/sonia/scm/net/HttpClient.java
@@ -48,7 +48,10 @@ import java.util.Map;
  * @apiviz.landmark
  * @apiviz.uses sonia.scm.net.HttpRequest
  * @apiviz.uses sonia.scm.net.HttpResponse
+ * 
+ * @deprecated use {@link sonia.scm.net.ahc.AdvancedHttpClient} instead.
  */
+@Deprecated
 public interface HttpClient
 {
 
diff --git a/scm-core/src/main/java/sonia/scm/net/HttpRequest.java b/scm-core/src/main/java/sonia/scm/net/HttpRequest.java
index f3ccf9719c..3f171a3fa7 100644
--- a/scm-core/src/main/java/sonia/scm/net/HttpRequest.java
+++ b/scm-core/src/main/java/sonia/scm/net/HttpRequest.java
@@ -51,7 +51,11 @@ import java.util.Map;
  *
  * @author Sebastian Sdorra
  * @since 1.9
+ * 
+ * @deprecated use {@link sonia.scm.net.ahc.AdvancedHttpRequest} or 
+ *   {@link sonia.scm.net.ahc.AdvancedHttpRequestWithBody} instead.
  */
+@Deprecated
 public class HttpRequest
 {
 
diff --git a/scm-core/src/main/java/sonia/scm/net/HttpResponse.java b/scm-core/src/main/java/sonia/scm/net/HttpResponse.java
index 83cdf9ee61..ef297c2809 100644
--- a/scm-core/src/main/java/sonia/scm/net/HttpResponse.java
+++ b/scm-core/src/main/java/sonia/scm/net/HttpResponse.java
@@ -41,12 +41,16 @@ import java.io.InputStream;
 
 import java.util.List;
 import java.util.Map;
+import sonia.scm.net.ahc.AdvancedHttpResponse;
 
 /**
  * Response of a {@link HttpRequest} execute by the {@link HttpClient}.
  *
  * @author Sebastian Sdorra
+ * 
+ * @deprecated use {@link AdvancedHttpResponse} instead
  */
+@Deprecated
 public interface HttpResponse extends Closeable
 {
 
diff --git a/scm-webapp/src/test/java/sonia/scm/net/ahc/JsonContentTransformerTest.java b/scm-webapp/src/test/java/sonia/scm/net/ahc/JsonContentTransformerTest.java
index ff50427470..1828c5ccf2 100644
--- a/scm-webapp/src/test/java/sonia/scm/net/ahc/JsonContentTransformerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/net/ahc/JsonContentTransformerTest.java
@@ -38,7 +38,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import org.junit.Test;
 import static org.junit.Assert.*;
-import static org.hamcrest.Matchers.*;
 import static org.mockito.Mockito.*;
 
 /**