diff --git a/.drone.yml b/.drone.yml
index 6d36a6b..53018c4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -42,6 +42,14 @@ pipeline:
       event: [ push, pull_request ]
     commands:
       - go test -race -v cwtch.im/cwtch/testing/
+  filesharing-integ-test:
+    image: golang
+    when:
+      repo: cwtch.im/cwtch
+      branch: master
+      event: [ push, pull_request ]
+    commands:
+      - go test -race -v cwtch.im/cwtch/testing/filesharing
   notify-email:
       image: drillster/drone-email
       host: build.openprivacy.ca
diff --git a/testing/cwtch.png b/testing/filesharing/cwtch.png
similarity index 100%
rename from testing/cwtch.png
rename to testing/filesharing/cwtch.png
diff --git a/testing/filesharing/file_sharing_integration_test.go b/testing/filesharing/file_sharing_integration_test.go
index e56567f..d215ce5 100644
--- a/testing/filesharing/file_sharing_integration_test.go
+++ b/testing/filesharing/file_sharing_integration_test.go
@@ -112,7 +112,6 @@ func TestFileSharing(t *testing.T) {
 
 	bob.AddContact("alice?", alice.GetOnion(), model.AuthApproved)
 	alice.PeerWithOnion(bob.GetOnion())
-	bob.PeerWithOnion(alice.GetOnion())
 
 	fmt.Println("Waiting for alice and Bob to peer...")
 	waitForPeerPeerConnection(t, alice, bob)
@@ -124,7 +123,7 @@ func TestFileSharing(t *testing.T) {
 	err = filesharingFunctionality.ShareFile("cwtch.png", alice, bob.GetOnion())
 
 	if err != nil {
-		t.Fatalf("Error!")
+		t.Fatalf("Error!: %v", err)
 	}
 
 	// Wait for the messages to arrive...
@@ -140,7 +139,7 @@ func TestFileSharing(t *testing.T) {
 			err := json.Unmarshal([]byte(messageWrapper.Data), &fileMessageOverlay)
 
 			if err == nil {
-				filesharingFunctionality.DownloadFile(bob, alice.GetOnion(), "cwtch.out.png","cwtch.out.png.manifest", fmt.Sprintf("%s.%s", fileMessageOverlay.Hash, fileMessageOverlay.Nonce))
+				filesharingFunctionality.DownloadFile(bob, alice.GetOnion(), "cwtch.out.png", "cwtch.out.png.manifest", fmt.Sprintf("%s.%s", fileMessageOverlay.Hash, fileMessageOverlay.Nonce))
 			}
 		}