diff --git a/commons/src/main/java/org/wikimedia/commons/HandlerService.java b/commons/src/main/java/org/wikimedia/commons/HandlerService.java
index 80f29c73e..3b15a7474 100644
--- a/commons/src/main/java/org/wikimedia/commons/HandlerService.java
+++ b/commons/src/main/java/org/wikimedia/commons/HandlerService.java
@@ -7,6 +7,7 @@ import android.os.*;
 public abstract class HandlerService<T> extends Service {
     private volatile Looper threadLooper;
     private volatile ServiceHandler threadHandler;
+    private String serviceName;
 
     private final class ServiceHandler extends Handler {
         public ServiceHandler(Looper looper) {
@@ -39,10 +40,14 @@ public abstract class HandlerService<T> extends Service {
         return localBinder;
     }
 
+    protected HandlerService(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
-        HandlerThread thread = new HandlerThread("UploadService");
+        HandlerThread thread = new HandlerThread(serviceName);
         thread.start();
 
         threadLooper = thread.getLooper();
diff --git a/commons/src/main/java/org/wikimedia/commons/UploadService.java b/commons/src/main/java/org/wikimedia/commons/UploadService.java
index 6d9ddd54d..43abd576a 100644
--- a/commons/src/main/java/org/wikimedia/commons/UploadService.java
+++ b/commons/src/main/java/org/wikimedia/commons/UploadService.java
@@ -39,6 +39,10 @@ public class UploadService extends HandlerService<Contribution> {
     public static final int NOTIFICATION_UPLOAD_COMPLETE = 2;
     public static final int NOTIFICATION_UPLOAD_FAILED = 3;
 
+    protected UploadService(String serviceName) {
+        super("UploadService");
+    }
+
     private class NotificationUpdateProgressListener implements ProgressListener {
 
         String notificationTag;