diff --git a/pom.xml b/pom.xml
index 4ed911463..cb047f4b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,9 +68,9 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-step-api</artifactId>
-            <version>2.3</version>
+            <version>2.4-SNAPSHOT</version> <!-- TODO https://github.com/jenkinsci/workflow-step-api-plugin/pull/8 -->
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java
index 1b4120b04..93b4cf327 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java
@@ -29,7 +29,6 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.SettableFuture;
 import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn;
-import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException;
 import org.jenkinsci.plugins.workflow.steps.StepExecution;
 
 import javax.annotation.CheckForNull;
@@ -283,7 +282,8 @@ public void stop(Throwable t) {
         try {
             s.stop(t);
         } catch (Exception e) {
-            LOGGER.log(WARNING, "Failed to stop " + s, e);
+            t.addSuppressed(e);
+            s.getContext().onFailure(t);
         }
     }
 
diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java
new file mode 100644
index 000000000..04e3fe6a0
--- /dev/null
+++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java
@@ -0,0 +1,94 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.jenkinsci.plugins.workflow.cps;
+
+import hudson.AbortException;
+import hudson.model.Result;
+import hudson.security.ACL;
+import java.util.List;
+import jenkins.model.CauseOfInterruption;
+import jenkins.model.InterruptedBuildAction;
+import jenkins.model.Jenkins;
+import org.jenkinsci.plugins.workflow.job.WorkflowJob;
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+import org.jenkinsci.plugins.workflow.steps.AbstractStepDescriptorImpl;
+import org.jenkinsci.plugins.workflow.steps.AbstractStepExecutionImpl;
+import org.jenkinsci.plugins.workflow.steps.AbstractStepImpl;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.jvnet.hudson.test.BuildWatcher;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.TestExtension;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+public class CpsThreadTest {
+
+    @ClassRule public static BuildWatcher watcher = new BuildWatcher();
+    @Rule public JenkinsRule r = new JenkinsRule();
+
+    @Test public void stop() throws Exception {
+        WorkflowJob p = r.createProject(WorkflowJob.class, "p");
+        p.setDefinition(new CpsFlowDefinition("unkillable()", true));
+        final WorkflowRun b = p.scheduleBuild2(0).waitForStart();
+        r.waitForMessage("unkillable", b);
+        ACL.impersonate(Jenkins.ANONYMOUS, new Runnable() {
+            @Override public void run() {
+                b.getExecutor().interrupt();
+            }
+        });
+        r.waitForCompletion(b);
+        r.assertBuildStatus(Result.ABORTED, b);
+        InterruptedBuildAction iba = b.getAction(InterruptedBuildAction.class);
+        assertNotNull(iba);
+        List<CauseOfInterruption> causes = iba.getCauses();
+        assertEquals(1, causes.size());
+        assertEquals(CauseOfInterruption.UserInterruption.class, causes.get(0).getClass());
+        r.assertLogContains("never going to stop", b);
+        r.assertLogNotContains("\tat ", b);
+    }
+
+    public static class UnkillableStep extends AbstractStepImpl {
+        @DataBoundConstructor public UnkillableStep() {}
+        public static class Execution extends AbstractStepExecutionImpl {
+            @Override public boolean start() throws Exception {
+                return false;
+            }
+            @Override public void stop(Throwable cause) throws Exception {
+                throw new AbortException("never going to stop");
+            }
+        }
+        @TestExtension public static class DescriptorImpl extends AbstractStepDescriptorImpl {
+            public DescriptorImpl() {
+                super(Execution.class);
+            }
+            @Override public String getFunctionName() {
+                return "unkillable";
+            }
+        }
+    }
+
+}