diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java
index c48d9b10f..35989e88e 100644
--- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java
+++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java
@@ -81,6 +81,8 @@
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.eclipse.jgit.transport.resolver.RepositoryResolver;
 import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
+import org.junit.Before;
+import org.junit.Test;
 
 public class HttpClientTests extends HttpTestCase {
 	private TestRepository<FileRepository> remoteRepository;
@@ -93,6 +95,7 @@ public class HttpClientTests extends HttpTestCase {
 
 	private URIish smartAuthBasicURI;
 
+	@Before
 	public void setUp() throws Exception {
 		super.setUp();
 
@@ -149,6 +152,7 @@ private static String nameOf(final FileRepository db) {
 		return db.getDirectory().getName();
 	}
 
+	@Test
 	public void testRepositoryNotFound_Dumb() throws Exception {
 		URIish uri = toURIish("/dumb.none/not-found");
 		Repository dst = createBareRepository();
@@ -167,6 +171,7 @@ public void testRepositoryNotFound_Dumb() throws Exception {
 		}
 	}
 
+	@Test
 	public void testRepositoryNotFound_Smart() throws Exception {
 		URIish uri = toURIish("/smart.none/not-found");
 		Repository dst = createBareRepository();
@@ -185,6 +190,7 @@ public void testRepositoryNotFound_Smart() throws Exception {
 		}
 	}
 
+	@Test
 	public void testListRemote_Dumb_DetachedHEAD() throws Exception {
 		Repository src = remoteRepository.getRepository();
 		RefUpdate u = src.updateRef(Constants.HEAD, true);
@@ -209,6 +215,7 @@ public void testListRemote_Dumb_DetachedHEAD() throws Exception {
 		assertEquals(Q, head.getObjectId());
 	}
 
+	@Test
 	public void testListRemote_Dumb_NoHEAD() throws Exception {
 		FileRepository src = remoteRepository.getRepository();
 		File headref = new File(src.getDirectory(), Constants.HEAD);
@@ -231,6 +238,7 @@ public void testListRemote_Dumb_NoHEAD() throws Exception {
 		assertNull("has no " + Constants.HEAD, head);
 	}
 
+	@Test
 	public void testListRemote_Smart_DetachedHEAD() throws Exception {
 		Repository src = remoteRepository.getRepository();
 		RefUpdate u = src.updateRef(Constants.HEAD, true);
@@ -255,6 +263,7 @@ public void testListRemote_Smart_DetachedHEAD() throws Exception {
 		assertEquals(Q, head.getObjectId());
 	}
 
+	@Test
 	public void testListRemote_Smart_WithQueryParameters() throws Exception {
 		URIish myURI = toURIish("/snone/do?r=1&p=test.git");
 		Repository dst = createBareRepository();
@@ -283,6 +292,7 @@ public void testListRemote_Smart_WithQueryParameters() throws Exception {
 		assertEquals(404, info.getStatus());
 	}
 
+	@Test
 	public void testListRemote_Dumb_NeedsAuth() throws Exception {
 		Repository dst = createBareRepository();
 		Transport t = Transport.open(dst, dumbAuthBasicURI);
@@ -300,6 +310,7 @@ public void testListRemote_Dumb_NeedsAuth() throws Exception {
 		}
 	}
 
+	@Test
 	public void testListRemote_Dumb_Auth() throws Exception {
 		Repository dst = createBareRepository();
 		Transport t = Transport.open(dst, dumbAuthBasicURI);
@@ -325,6 +336,7 @@ public void testListRemote_Dumb_Auth() throws Exception {
 		}
 	}
 
+	@Test
 	public void testListRemote_Smart_UploadPackNeedsAuth() throws Exception {
 		Repository dst = createBareRepository();
 		Transport t = Transport.open(dst, smartAuthBasicURI);
@@ -342,6 +354,7 @@ public void testListRemote_Smart_UploadPackNeedsAuth() throws Exception {
 		}
 	}
 
+	@Test
 	public void testListRemote_Smart_UploadPackDisabled() throws Exception {
 		FileRepository src = remoteRepository.getRepository();
 		final FileBasedConfig cfg = src.getConfig();