diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerTask.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerTask.java
index 6ea1ddd96d1e3..9cecb3d258231 100644
--- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerTask.java
+++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerTask.java
@@ -51,6 +51,7 @@
  */
 abstract class WorkerTask implements Runnable {
     private static final Logger log = LoggerFactory.getLogger(WorkerTask.class);
+    private static final String THREAD_NAME_PREFIX = "task-thread-";
 
     protected final ConnectorTaskId id;
     private final TaskStatus.Listener statusListener;
@@ -215,7 +216,9 @@ protected synchronized void onResume() {
     @Override
     public void run() {
         ClassLoader savedLoader = Plugins.compareAndSwapLoaders(loader);
+        String savedName = Thread.currentThread().getName();
         try {
+            Thread.currentThread().setName(THREAD_NAME_PREFIX + id);
             doRun();
             onShutdown();
         } catch (Throwable t) {
@@ -225,6 +228,7 @@ public void run() {
                 throw (Error) t;
         } finally {
             try {
+                Thread.currentThread().setName(savedName);
                 Plugins.compareAndSwapLoaders(savedLoader);
                 shutdownLatch.countDown();
             } finally {