diff --git a/alfresco-tas-share-test/src/test/java/org/alfresco/share/BaseTest.java b/alfresco-tas-share-test/src/test/java/org/alfresco/share/BaseTest.java
index 58c01e9ed6..33eecbd401 100644
--- a/alfresco-tas-share-test/src/test/java/org/alfresco/share/BaseTest.java
+++ b/alfresco-tas-share-test/src/test/java/org/alfresco/share/BaseTest.java
@@ -73,7 +73,7 @@ protected void beforeEachTest(ITestContext iTestContext)
     {
         setApplicationsContext();
         webDriver.set(webDriverFactory.createWebDriver());
-        //setTestContext(iTestContext, webDriver.get());
+        setTestContext(iTestContext, webDriver.get());
 
         userDashboardPage = new UserDashboardPage(webDriver);
     }
@@ -207,9 +207,9 @@ protected void deleteSitesIfNotNull(SiteModel... sites)
         }
     }
 
-    /*private ITestContext setTestContext(ITestContext iTestContext, WebDriver driver)
+    private ITestContext setTestContext(ITestContext iTestContext, WebDriver driver)
     {
         iTestContext.setAttribute("driver", driver);
         return iTestContext;
-    }*/
+    }
 }
diff --git a/alfresco-tas-share-test/src/test/java/org/alfresco/share/TestListener.java b/alfresco-tas-share-test/src/test/java/org/alfresco/share/TestListener.java
index b8cb13a0cd..7374a9c3a6 100644
--- a/alfresco-tas-share-test/src/test/java/org/alfresco/share/TestListener.java
+++ b/alfresco-tas-share-test/src/test/java/org/alfresco/share/TestListener.java
@@ -1,6 +1,7 @@
 package org.alfresco.share;
 
 import lombok.extern.slf4j.Slf4j;
+import org.openqa.selenium.WebDriver;
 import org.testng.ITestContext;
 import org.testng.ITestListener;
 import org.testng.ITestResult;
@@ -24,8 +25,8 @@ public void onTestSuccess(ITestResult result)
     public void onTestFailure(ITestResult result)
     {
         log.warn("TEST FAILED: {}", result.getMethod().getMethodName());
-//        WebDriver webDriver = (WebDriver) result.getTestContext().getAttribute("driver");
-//        captureAndSaveScreenshot(webDriver, result);
+        WebDriver webDriver = (WebDriver) result.getTestContext().getAttribute("driver");
+        captureAndSaveScreenshot(webDriver, result);
     }
 
     @Override
diff --git a/alfresco-tas-share-test/src/test/resources/share-po-runner-suite.xml b/alfresco-tas-share-test/src/test/resources/share-po-runner-suite.xml
index fead5dee67..b526ea9354 100644
--- a/alfresco-tas-share-test/src/test/resources/share-po-runner-suite.xml
+++ b/alfresco-tas-share-test/src/test/resources/share-po-runner-suite.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="SharePoSuite">
    <listeners>
-      <listener class-name="org.alfresco.utility.report.HtmlReportListener"/>
       <listener class-name="org.alfresco.utility.testrail.TestRailExecutorListener"/>
       <listener class-name="org.alfresco.utility.testng.OSTestMethodSelector"/>
    </listeners>
diff --git a/alfresco-tas-share-test/src/test/resources/test-suites/admin-tools-tests.xml b/alfresco-tas-share-test/src/test/resources/test-suites/admin-tools-tests.xml
index 6318198990..21b47fbb73 100644
--- a/alfresco-tas-share-test/src/test/resources/test-suites/admin-tools-tests.xml
+++ b/alfresco-tas-share-test/src/test/resources/test-suites/admin-tools-tests.xml
@@ -1,7 +1,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="Admin Tools Test Suite" parallel="classes" thread-count="3">
    <listeners>
-      <listener class-name="org.alfresco.utility.report.HtmlReportListener"/>
       <listener class-name="org.alfresco.share.RetryListener"/>
    </listeners>
 
diff --git a/alfresco-tas-share-test/src/test/resources/test-suites/aims-user-tests.xml b/alfresco-tas-share-test/src/test/resources/test-suites/aims-user-tests.xml
index 06b45ed978..526d8eaf08 100644
--- a/alfresco-tas-share-test/src/test/resources/test-suites/aims-user-tests.xml
+++ b/alfresco-tas-share-test/src/test/resources/test-suites/aims-user-tests.xml
@@ -1,7 +1,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="User and Authentication Tests For AIMS" parallel="classes" thread-count="3">
    <listeners>
-      <listener class-name="org.alfresco.utility.report.HtmlReportListener"/>
       <listener class-name="org.alfresco.share.RetryListener"/>
    </listeners>
 
diff --git a/alfresco-tas-share-test/src/test/resources/test-suites/content-actions-tests.xml b/alfresco-tas-share-test/src/test/resources/test-suites/content-actions-tests.xml
index 9f980ea26b..87d5e8ced5 100644
--- a/alfresco-tas-share-test/src/test/resources/test-suites/content-actions-tests.xml
+++ b/alfresco-tas-share-test/src/test/resources/test-suites/content-actions-tests.xml
@@ -1,7 +1,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="Content Tests" parallel="classes" thread-count="3">
    <listeners>
-      <listener class-name="org.alfresco.utility.report.HtmlReportListener"/>
       <listener class-name="org.alfresco.share.RetryListener"/>
    </listeners>
 
diff --git a/alfresco-tas-share-test/src/test/resources/test-suites/content-filters-tests.xml b/alfresco-tas-share-test/src/test/resources/test-suites/content-filters-tests.xml
index cd4327298f..744f1e97ea 100644
--- a/alfresco-tas-share-test/src/test/resources/test-suites/content-filters-tests.xml
+++ b/alfresco-tas-share-test/src/test/resources/test-suites/content-filters-tests.xml
@@ -1,7 +1,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="Content Tests" parallel="classes" thread-count="3">
    <listeners>
-      <listener class-name="org.alfresco.utility.report.HtmlReportListener"/>
       <listener class-name="org.alfresco.share.RetryListener"/>
    </listeners>
 
diff --git a/alfresco-tas-share-test/src/test/resources/test-suites/site-members-tests.xml b/alfresco-tas-share-test/src/test/resources/test-suites/site-members-tests.xml
index d352f5ba34..3eb8c0931b 100644
--- a/alfresco-tas-share-test/src/test/resources/test-suites/site-members-tests.xml
+++ b/alfresco-tas-share-test/src/test/resources/test-suites/site-members-tests.xml
@@ -1,7 +1,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="Site Members Tests" parallel="classes" thread-count="3">
    <listeners>
-      <listener class-name="org.alfresco.utility.report.HtmlReportListener"/>
       <listener class-name="org.alfresco.share.RetryListener"/>
    </listeners>
 
diff --git a/alfresco-tas-share-test/src/test/resources/test-suites/user-and-site-dashboard-tests.xml b/alfresco-tas-share-test/src/test/resources/test-suites/user-and-site-dashboard-tests.xml
index b2402144e2..d84254b89c 100644
--- a/alfresco-tas-share-test/src/test/resources/test-suites/user-and-site-dashboard-tests.xml
+++ b/alfresco-tas-share-test/src/test/resources/test-suites/user-and-site-dashboard-tests.xml
@@ -1,7 +1,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="User Dashboard Tests" parallel="classes" thread-count="3">
    <listeners>
-      <listener class-name="org.alfresco.utility.report.HtmlReportListener"/>
       <listener class-name="org.alfresco.share.RetryListener"/>
    </listeners>
 
diff --git a/alfresco-tas-share-test/src/test/resources/test-suites/user-tests.xml b/alfresco-tas-share-test/src/test/resources/test-suites/user-tests.xml
index fbd2377ca3..694caca3cb 100644
--- a/alfresco-tas-share-test/src/test/resources/test-suites/user-tests.xml
+++ b/alfresco-tas-share-test/src/test/resources/test-suites/user-tests.xml
@@ -1,7 +1,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="User and Authentication Tests" parallel="classes" thread-count="3">
    <listeners>
-      <listener class-name="org.alfresco.utility.report.HtmlReportListener"/>
       <listener class-name="org.alfresco.share.RetryListener"/>
    </listeners>