diff --git a/ttnhabbridge/src/test/java/nl/sikken/bertrik/hab/amateurSondehub/AmateurSondehubTest.java b/ttnhabbridge/src/test/java/nl/sikken/bertrik/hab/amateurSondehub/AmateurSondehubTest.java
new file mode 100644
index 0000000..c0d1414
--- /dev/null
+++ b/ttnhabbridge/src/test/java/nl/sikken/bertrik/hab/amateurSondehub/AmateurSondehubTest.java
@@ -0,0 +1,133 @@
+package nl.sikken.bertrik.hab.amateurSondehub;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import nl.sikken.bertrik.hab.Sentence;
+import retrofit2.mock.Calls;
+
+/**
+ * Unit tests for AmateurSondehubUploader.
+ */
+public final class AmateurSondehubTest {
+    
+    private static final Location LOCATION = new Location(52.0162, 4.4735, 5.0);
+    
+    /**
+     * Verifies creation of REST client.
+     */
+    @Test
+    public void testCreateRestClient() {
+        AmateurSondehubConfig config = new AmateurSondehubConfig();
+    	Assert.assertNotNull(AmateurSondehubUploader.create(config));
+    }
+    
+	/**
+	 * Happy flow scenario for payload upload.
+	 * @throws IOException 
+	 */
+	@Test
+	public void testUploadPayload() throws IOException {
+		// create a mocked rest client
+		IAmateurSondehubRestApi restClient = Mockito.mock(IAmateurSondehubRestApi.class);
+		Mockito.when(restClient.updateListener(Mockito.anyString(), Mockito.anyString()))
+		        .thenReturn(Calls.response("OK"));
+		Mockito.when(restClient.getUuids(Mockito.anyInt()))
+		        .thenReturn(Calls.response(new UuidsList(Arrays.asList("uuid1", "uuid2"))));
+		
+		AmateurSondehubUploader uploader = new AmateurSondehubUploader(restClient);
+		
+		// verify upload using the uploader
+		uploader.start();
+		try {
+			HabReceiver receiver = new HabReceiver("BERTRIK", LOCATION);
+			Instant instant = Instant.now();
+			Sentence sentence = new Sentence("NOTAFLIGHT", 1, instant);
+			sentence.addField("52.0182307,4.695772,1000");
+
+			uploader.schedulePayloadTelemetryUpload(sentence.format(), Arrays.asList(receiver), instant);
+            Mockito.verify(restClient, Mockito.timeout(3000).times(1)).updateListener(Mockito.anyString(),
+                    Mockito.anyString());
+		} finally {
+			uploader.stop();
+		}
+	}
+	
+	/**
+	 * Happy flow scenario for listener upload.
+	 */
+	@Test
+	public void testUploadListener() {
+        // create a mocked rest client
+        IAmateurSondehubRestApi restClient = Mockito.mock(IAmateurSondehubRestApi.class);
+        Mockito.when(restClient.getUuids(Mockito.anyInt()))
+                .thenReturn(Calls.response(new UuidsList(Arrays.asList("uuid1", "uuid2"))));
+        Mockito.when(restClient.uploadDocument(Mockito.anyString(), Mockito.anyString()))
+                .thenReturn(Calls.response(new UploadResult(true, "id", "rev")));
+        
+        AmateurSondehubUploader uploader = new AmateurSondehubUploader(restClient);
+        
+        // verify upload using the uploader
+        uploader.start();
+        try {
+            HabReceiver receiver = new HabReceiver("BERTRIK", LOCATION);
+            Instant instant = Instant.now();
+            
+            uploader.scheduleListenerDataUpload(receiver, instant);
+            
+            // expect two documents
+            Mockito.verify(restClient, Mockito.timeout(3000).times(2)).uploadDocument(Mockito.anyString(),
+                    Mockito.anyString());
+        } finally {
+            uploader.stop();
+        }
+	}
+
+	/**
+     * Verifies upload of payload telemetry to the actual amateurSondehub server on the internet.
+	 * 
+	 * @throws InterruptedException in case the sleep got interrupted
+	 */
+	@Test
+    @Ignore("this is not a junit test")
+	public void testActualPayloadUpload() throws InterruptedException {
+		AmateurSondehubUploader uploader = AmateurSondehubUploader.create(new AmateurSondehubConfig());
+		uploader.start();
+		try {
+			Instant instant = Instant.now();
+			Sentence sentence = new Sentence("NOTAFLIGHT", 1, instant);
+			sentence.addField("52.0182307,4.695772,1000");
+			HabReceiver receiver = new HabReceiver("BERTRIK", null);
+			uploader.schedulePayloadTelemetryUpload(sentence.format(), Arrays.asList(receiver), instant);
+			Thread.sleep(3000);
+		} finally {
+			uploader.stop();
+		}
+	}
+	
+	/**
+	 * Verifies upload of listener information and telemetry to the actual amateurSondehub server on the internet.
+	 * 
+     * @throws InterruptedException in case the sleep got interrupted
+	 */
+	@Test
+    @Ignore("this is not a junit test")
+	public void testActualListenerUpload() throws InterruptedException {
+        AmateurSondehubUploader uploader = AmateurSondehubUploader.create(new AmateurSondehubConfig());
+	    try {
+            Instant instant = Instant.now();
+            HabReceiver receiver = new HabReceiver("BERTRIK", new Location(52.0182307, 4.695772, 15.0));
+	        uploader.scheduleListenerDataUpload(receiver, instant);
+	        Thread.sleep(3000);
+	    } finally {
+	        uploader.stop();
+	    }
+	}
+	
+}