diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 24b492604d..ba0556f960 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -241,7 +241,9 @@ def sstate_clean(ss, d):
     for lock in locks:
         bb.utils.unlockfile(lock)
 
-    oe.path.remove(d.getVar("STAMP", True) + ".do_" + ss['task'] + "*")
+    stfile = d.getVar("STAMP", True) + ".do_" + ss['task']
+    oe.path.remove(stfile)
+    oe.path.remove(stfile + ".*")
 
 CLEANFUNCS += "sstate_cleanall"