diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index c24690c868..1f217a872c 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -24,6 +24,26 @@
     </div>
 </div>
 
+<div class='panel panel-default panel-inventree panel-hidden' id='panel-test-templates'>
+    <div class='panel-heading'>
+        <h4>{% trans "Part Test Templates" %}</h4>
+    </div>
+    <div class='panel-content'>
+        <div id='test-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='#test-button-toolbar' id='test-template-table'></table>        
+    </div>
+</div>
+
 <div class='panel panel-default panel-inventree panel-hidden' id='panel-part-notes'>
     <div class='panel-heading'>
         <div class='row'>
@@ -81,6 +101,70 @@
 {% block js_ready %}
     {{ block.super }}
 
+    loadPartTestTemplateTable(
+        $("#test-template-table"),
+        {
+            part: {{ part.pk }},
+            params: {
+                part: {{ part.pk }},
+            }
+        }
+    );
+    
+    function reloadTable() {
+        $("#test-template-table").bootstrapTable("refresh");
+    }
+    
+    $("#add-test-template").click(function() {
+    
+        constructForm('{% url "api-part-test-template-list" %}', {
+            method: 'POST',
+            fields: {
+                test_name: {},
+                description: {},
+                required: {},
+                requires_value: {},
+                requires_attachment: {},
+                part: {
+                    value: {{ part.pk }},
+                    hidden: true,
+                }
+            },
+            title: '{% trans "Add Test Result Template" %}',
+            onSuccess: reloadTable
+        });
+    });
+    
+    $("#test-template-table").on('click', '.button-test-edit', function() {
+        var pk = $(this).attr('pk');
+    
+        var url = `/api/part/test-template/${pk}/`;
+    
+        constructForm(url, {
+            fields: {
+                test_name: {},
+                description: {},
+                required: {},
+                requires_value: {},
+                requires_attachment: {},
+            },
+            title: '{% trans "Edit Test Result Template" %}',
+            onSuccess: reloadTable,
+        });
+    });
+    
+    $("#test-template-table").on('click', '.button-test-delete', function() {
+        var pk = $(this).attr('pk');
+    
+        var url = `/api/part/test-template/${pk}/`;
+    
+        constructForm(url, {
+            method: 'DELETE',
+            title: '{% trans "Delete Test Result Template" %}',
+            onSuccess: reloadTable,
+        });
+    });
+
     $('#add-stock-item').click(function () {
         createNewStockItem({
             reload: true,
diff --git a/InvenTree/part/templates/part/part_tests.html b/InvenTree/part/templates/part/part_tests.html
deleted file mode 100644
index 3c131aa1d4..0000000000
--- a/InvenTree/part/templates/part/part_tests.html
+++ /dev/null
@@ -1,96 +0,0 @@
-{% extends "part/part_base.html" %}
-{% load static %}
-{% load i18n %}
-
-{% block menubar %}
-{% include 'part/navbar.html' with tab='tests' %}
-{% endblock %}
-
-{% block heading %}
-{% trans "Part Test Templates" %}
-{% endblock %}
-
-{% block details %}
-<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 }}
-
-loadPartTestTemplateTable(
-    $("#test-template-table"),
-    {
-        part: {{ part.pk }},
-        params: {
-            part: {{ part.pk }},
-        }
-    }
-);
-
-function reloadTable() {
-    $("#test-template-table").bootstrapTable("refresh");
-}
-
-$("#add-test-template").click(function() {
-
-    constructForm('{% url "api-part-test-template-list" %}', {
-        method: 'POST',
-        fields: {
-            test_name: {},
-            description: {},
-            required: {},
-            requires_value: {},
-            requires_attachment: {},
-            part: {
-                value: {{ part.pk }},
-                hidden: true,
-            }
-        },
-        title: '{% trans "Add Test Result Template" %}',
-        onSuccess: reloadTable
-    });
-});
-
-$("#test-template-table").on('click', '.button-test-edit', function() {
-    var pk = $(this).attr('pk');
-
-    var url = `/api/part/test-template/${pk}/`;
-
-    constructForm(url, {
-        fields: {
-            test_name: {},
-            description: {},
-            required: {},
-            requires_value: {},
-            requires_attachment: {},
-        },
-        title: '{% trans "Edit Test Result Template" %}',
-        onSuccess: reloadTable,
-    });
-});
-
-$("#test-template-table").on('click', '.button-test-delete', function() {
-    var pk = $(this).attr('pk');
-
-    var url = `/api/part/test-template/${pk}/`;
-
-    constructForm(url, {
-        method: 'DELETE',
-        title: '{% trans "Delete Test Result Template" %}',
-        onSuccess: reloadTable,
-    });
-});
-
-{% endblock %}
\ No newline at end of file