diff --git a/lib/galaxy/webapps/tool_shed/util/container_util.py b/lib/galaxy/webapps/tool_shed/util/container_util.py
index a20ed710793..5c610c3f65e 100644
--- a/lib/galaxy/webapps/tool_shed/util/container_util.py
+++ b/lib/galaxy/webapps/tool_shed/util/container_util.py
@@ -36,6 +36,7 @@ class Folder( object ):
         self.tool_dependencies = []
         self.failed_tests = []
         self.missing_test_components = []
+        self.not_tested = []
         self.passed_tests = []
         self.test_environments = []
         self.repository_dependencies = []
@@ -161,6 +162,14 @@ class MissingTestComponent( object ):
         self.tool_version = tool_version
 
 
+class NotTested( object ):
+    """NotTested object"""
+
+    def __init__( self, id=None, reason=None ):
+        self.id = id
+        self.reason = reason
+
+
 class PassedTest( object ):
     """Passed tool tests object"""
 
@@ -1048,6 +1057,15 @@ def build_tool_test_results_folder( trans, folder_id, tool_test_results_dict, la
                                                 tool_shed_mercurial_version=test_environment_dict.get( 'tool_shed_mercurial_version', '' ),
                                                 tool_shed_revision=test_environment_dict.get( 'tool_shed_revision', '' ) )
             folder.test_environments.append( test_environment )
+        not_tested_dict = tool_test_results_dict.get( 'not_tested', {} )
+        if not_tested_dict:
+            folder_id += 1
+            folder = Folder( id=folder_id, key='not_tested', label='Not tested', parent=test_results_folder )
+            test_results_folder.folders.append( folder )
+            not_tested_id = 0
+            not_tested = NotTested( id=not_tested_id,
+                                    reason=not_tested_dict.get( 'reason', '' ) )
+            folder.not_tested.append( not_tested )
         passed_tests_dicts = tool_test_results_dict.get( 'passed_tests', [] )
         if passed_tests_dicts:
             folder_id += 1
diff --git a/templates/webapps/tool_shed/repository/common.mako b/templates/webapps/tool_shed/repository/common.mako
index 1c7126bfdb8..085c3a267d5 100644
--- a/templates/webapps/tool_shed/repository/common.mako
+++ b/templates/webapps/tool_shed/repository/common.mako
@@ -337,6 +337,11 @@
             ${render_failed_test( failed_test, pad, my_row, row_counter )}
         %endfor
     %endif
+    %if folder.not_tested:
+        %for not_tested in folder.not_tested:
+            ${render_not_tested( not_tested, pad, my_row, row_counter )}
+        %endfor
+    %endif
     %if folder.passed_tests:
         %for passed_test in folder.passed_tests:
             ${render_passed_test( passed_test, pad, my_row, row_counter )}
@@ -731,6 +736,35 @@
     %>
 </%def>
 
+<%def name="render_not_tested( not_tested, pad, parent, row_counter, row_is_header=False )">
+    <% encoded_id = trans.security.encode_id( not_tested.id ) %>
+    <style type="text/css">
+        #not_tested_table{ table-layout:fixed;
+                           width:100%;
+                           overflow-wrap:normal;
+                           overflow:hidden;
+                           border:0px; 
+                           word-break:keep-all;
+                           word-wrap:break-word;
+                           line-break:strict; }
+    </style>
+    <tr class="datasetRow"
+        %if parent is not None:
+            parent="${parent}"
+        %endif
+        id="libraryItem-${encoded_id}">
+        <td style="padding-left: ${pad+20}px;">
+            <table id="not_tested_table">
+                <tr><td>${not_tested.reason | h}</td></tr>
+            </table>
+        </td>
+    </tr>
+    <%
+        my_row = row_counter.count
+        row_counter.increment()
+    %>
+</%def>
+
 <%def name="render_passed_test( passed_test, pad, parent, row_counter, row_is_header=False )">
     <% encoded_id = trans.security.encode_id( passed_test.id ) %>
     <style type="text/css">