diff --git a/apps/remix-ide/src/app/tabs/test-tab.js b/apps/remix-ide/src/app/tabs/test-tab.js
index 277abab11d..9e2459d7ac 100644
--- a/apps/remix-ide/src/app/tabs/test-tab.js
+++ b/apps/remix-ide/src/app/tabs/test-tab.js
@@ -247,6 +247,14 @@ module.exports = class TestTab extends ViewPlugin {
 
   testCallback (result, runningTests) {
     this.testsOutput.hidden = false
+    let debugBtn = yo``
+    if((result.type === 'testPass' || result.type === 'testFailure') && result.debugTxHash) {
+      const { web3, debugTxHash } = result
+      debugBtn = yo `<div class="btn border btn btn-sm ml-1" title="Start debugging" onclick=${() => this.startDebug(debugTxHash, web3)}>
+        <i class="fas fa-bug"></i>
+      </div>`
+      debugBtn.style.cursor = 'pointer'
+    }
     if (result.type === 'contract') {
       this.testSuite = result.value
       if (this.testSuites) {
@@ -271,26 +279,15 @@ module.exports = class TestTab extends ViewPlugin {
           class="${css.testPass} ${css.testLog} bg-light mb-2 text-success border-0"
           onclick=${() => this.discardHighlight()}
         >
-          ✓ ${result.value}
+          <div class="d-flex my-1 align-items-start justify-content-between">
+            <span> ✓ ${result.value}</span>
+            ${debugBtn}
+          </div>
         </div>
       `)
     } else if (result.type === 'testFailure') {
       if (result.hhLogs && result.hhLogs.length) this.printHHLogs(result.hhLogs, result.value)
       if (!result.assertMethod) {
-        let debugBtn = yo``
-        if (result.errMsg.includes('Transaction has been reverted by the EVM')) {
-          const txHash = JSON.parse(result.errMsg.replace('Transaction has been reverted by the EVM:', '')).transactionHash
-          const { web3 } = result
-          debugBtn = yo`<div
-            class="btn border btn btn-sm ml-1"
-            title="Start debugging"
-            onclick=${() => this.startDebug(txHash, web3)}
-          >
-            <i class="fas fa-bug"></i>
-          </div>`
-          debugBtn.style.visibility = 'visible'
-          debugBtn.style.cursor = 'pointer'
-        } else debugBtn.style.visibility = 'hidden'
         this.testsOutput.appendChild(yo`
         <div
           class="bg-light mb-2 px-2 ${css.testLog} d-flex flex-column text-danger border-0"
@@ -315,7 +312,10 @@ module.exports = class TestTab extends ViewPlugin {
             id="UTContext${result.context}"
             onclick=${() => this.highlightLocation(result.location, runningTests, result.filename)}
           >
-            <span> ✘ ${result.value}</span>
+            <div class="d-flex my-1 align-items-start justify-content-between">  
+              <span> ✘ ${result.value}</span>
+              ${debugBtn}
+            </div> 
             <span class="text-dark">Error Message:</span>
             <span class="pb-2 text-break">"${result.errMsg}"</span>
             <span class="text-dark">Assertion:</span>