diff --git a/InvenTree/part/templates/part/part_tests.html b/InvenTree/part/templates/part/part_tests.html
new file mode 100644
index 0000000000..bb0dbb7683
--- /dev/null
+++ b/InvenTree/part/templates/part/part_tests.html
@@ -0,0 +1,29 @@
+{% extends "part/part_base.html" %}
+{% load static %}
+{% load i18n %}
+{% block details %}
+
+{% include 'part/tabs.html' with tab='tests' %}
+
+<h4>{% trans "Part Test Templates" %}</h4>
+<hr>
+
+<div id='button-toolbar'>
+    <div class='button-toolbar container-fluid' style="float: right;">
+        <div class='btn-group' role='group'>
+            <button type='button' class='btn btn-success' id='add-test-template'>{% trans "Add Test Template" %}</button>
+        </div>
+        <div class='filter-list' id='filter-list-parttests'>
+            <!-- Empty div -->
+        </div>
+    </div>
+</div>
+
+<table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='test-template-table'></table>
+
+{% endblock %}
+
+{% block js_ready %}
+{{ block.super }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/tabs.html b/InvenTree/part/templates/part/tabs.html
index b47ebfe329..28aa2cbb4d 100644
--- a/InvenTree/part/templates/part/tabs.html
+++ b/InvenTree/part/templates/part/tabs.html
@@ -48,7 +48,9 @@
         <a href="{% url 'part-sales-orders' part.id %}">{% trans "Sales Orders" %} <span class='badge'>{{ part.sales_orders|length }}</span></a>
     </li>
     {% endif %}
-    {% if 0 and part.trackable %}
+    {% if part.trackable %}
+    {% if 0 %}
+    <!-- TODO - Add the 'tracking' tab back in -->
     <li{% ifequal tab 'track' %} class="active"{% endifequal %}>
         <a href="{% url 'part-track' part.id %}">{% trans "Tracking" %}
         {% if parts.serials.all|length > 0 %}
@@ -56,6 +58,12 @@
         {% endif %}
     </a></li>
     {% endif %}
+    <li{% ifequal tab 'tests' %} class='active'{% endifequal %}>
+        <a href='{% url "part-test-templates" part.id %}'>{% trans "Tests" %}
+            {% if part.getTestTemplates.count > 0 %}<span class='badge'>{{ part.getTestTemplates.count }}</span>{% endif %}
+        </a>
+    </li>
+    {% endif %}
     <li{% ifequal tab 'attachments' %} class="active"{% endifequal %}>
         <a href="{% url 'part-attachments' part.id %}">{% trans "Attachments" %} {% if part.attachment_count > 0 %}<span class="badge">{{ part.attachment_count }}</span>{% endif %}</a>
     </li>
diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py
index 10db202fb9..a5aa412b24 100644
--- a/InvenTree/part/urls.py
+++ b/InvenTree/part/urls.py
@@ -52,6 +52,7 @@ part_detail_urls = [
     url(r'^suppliers/?', views.PartDetail.as_view(template_name='part/supplier.html'), name='part-suppliers'),
     url(r'^orders/?', views.PartDetail.as_view(template_name='part/orders.html'), name='part-orders'),
     url(r'^sales-orders/', views.PartDetail.as_view(template_name='part/sales_orders.html'), name='part-sales-orders'),
+    url(r'^tests/', views.PartDetail.as_view(template_name='part/part_tests.html'), name='part-test-templates'),
     url(r'^track/?', views.PartDetail.as_view(template_name='part/track.html'), name='part-track'),
     url(r'^attachments/?', views.PartDetail.as_view(template_name='part/attachments.html'), name='part-attachments'),
     url(r'^notes/?', views.PartNotes.as_view(), name='part-notes'),
diff --git a/InvenTree/stock/templates/stock/item_tests.html b/InvenTree/stock/templates/stock/item_tests.html
index 6621637f1f..bd16ee8d29 100644
--- a/InvenTree/stock/templates/stock/item_tests.html
+++ b/InvenTree/stock/templates/stock/item_tests.html
@@ -13,7 +13,7 @@
 <div id='button-toolbar'>
     <div class='button-toolbar container-fluid' style="float: right;">
         <div class='btn-group' role='group'>
-            <button type='button' class='btn btn-success' id='add-test-result'>{% trans "Add Test Result" %}</button>
+            <button type='button' class='btn btn-success' id='add-test-result'>{% trans "Add Test Data" %}</button>
         </div>
         <div class='filter-list' id='filter-list-stocktests'>
             <!-- Empty div -->
diff --git a/InvenTree/stock/templates/stock/tabs.html b/InvenTree/stock/templates/stock/tabs.html
index 5ec75ddc28..1e6e9ddb3b 100644
--- a/InvenTree/stock/templates/stock/tabs.html
+++ b/InvenTree/stock/templates/stock/tabs.html
@@ -10,7 +10,7 @@
     {% if item.part.trackable %}
     <li{% if tab == 'tests' %} class='active'{% endif %}>
         <a href="{% url 'stock-item-test-results' item.id %}">
-            {% trans "Test Results" %}
+            {% trans "Test Data" %}
             {% if item.test_results.count > 0 %}<span class='badge'>{{ item.test_results.count }}</span>{% endif %}
         </a>
     </li>