diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index 2c56b8eeb1..1df5e83d5d 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -79,6 +79,7 @@ settings_urls = [
     url(r'^theme/?', ColorThemeSelectView.as_view(), name='settings-theme'),
    
     url(r'^global/?', SettingsView.as_view(template_name='InvenTree/settings/global.html'), name='settings-global'),
+    url(r'^report/?', SettingsView.as_view(template_name='InvenTree/settings/report.html'), name='settings-report'),
     url(r'^category/?', SettingCategorySelectView.as_view(), name='settings-category'),
     url(r'^part/?', SettingsView.as_view(template_name='InvenTree/settings/part.html'), name='settings-part'),
     url(r'^stock/?', SettingsView.as_view(template_name='InvenTree/settings/stock.html'), name='settings-stock'),
diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index 053cc12864..a81d06ed25 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -174,6 +174,13 @@ class InvenTreeSetting(models.Model):
             'validator': bool,
         },
 
+        'REPORT_ENABLE_TEST_REPORT': {
+            'name': _('Test Reports'),
+            'description': _('Enable generation of test reports'),
+            'default': True,
+            'validator': bool,
+        },
+
         'STOCK_ENABLE_EXPIRY': {
             'name': _('Stock Expiry'),
             'description': _('Enable stock expiry functionality'),
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 84eac7e7f4..f35d616a91 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -44,7 +44,6 @@
                 <span id='part-star-icon' class='fas fa-star {% if starred %}icon-yellow{% endif %}'/>
             </button>
 
-            {% settings_value 'BARCODE_ENABLE' as barcodes %}
             {% if barcodes %}
             <!-- Barcode actions menu -->
             <div class='btn-group'>
diff --git a/InvenTree/report/templates/report/inventree_test_report.html b/InvenTree/report/templates/report/inventree_test_report.html
index 7ac1930632..e076a7919e 100644
--- a/InvenTree/report/templates/report/inventree_test_report.html
+++ b/InvenTree/report/templates/report/inventree_test_report.html
@@ -61,6 +61,7 @@ content: "{% trans 'Stock Item Test Report' %}";
         </h2>
         <p>{{ part.description }}</p>
         <p><i>{{ stock_item.location }}</i></p>
+        <p><i>Stock Item ID: {{ stock_item.pk }}</i></p>
     </div>
     <div class='img-right'>
         <img src="{% part_image part %}">
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index d284a74e98..93d60fb3d1 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -120,7 +120,7 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
 </div>
 
 <div class='btn-group action-buttons' role='group'>
-    {% settings_value 'BARCODE_ENABLE' as barcodes %}
+    
     {% if barcodes %}
     <!-- Barcode actions menu -->
     <div class='btn-group'>
@@ -139,19 +139,15 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
     </div>
     {% endif %}
     <!-- Document / label menu -->
-    {% if item.has_labels or item.has_test_reports %}
     <div class='btn-group'>
         <button id='document-options' title='{% trans "Printing actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-print'></span> <span class='caret'></span></button>
         <ul class='dropdown-menu' role='menu'>
-            {% if item.has_labels %}
             <li><a href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
-            {% endif %}
-            {% if item.has_test_reports %}
+            {% if test_report_enabled %}
             <li><a href='#' id='stock-test-report'><span class='fas fa-file-pdf'></span> {% trans "Test Report" %}</a></li>
             {% endif %}
         </ul>
     </div>
-    {% endif %}
     <!-- Stock adjustment menu -->
     <!-- Check permissions and owner -->
     {% if owner_control.value == "False" or owner_control.value == "True" and user in owners or user.is_superuser %}
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 4f8268b037..817b096f74 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -36,8 +36,7 @@
                 <span class='fas fa-plus-circle icon-green'/>
                 </button>
             {% endif %}
-        {% endif %} 
-        {% settings_value 'BARCODE_ENABLE' as barcodes %}
+        {% endif %}
         {% if barcodes %}
         <!-- Barcode actions menu -->
         {% if location %}
diff --git a/InvenTree/templates/InvenTree/settings/report.html b/InvenTree/templates/InvenTree/settings/report.html
new file mode 100644
index 0000000000..0cba8c449b
--- /dev/null
+++ b/InvenTree/templates/InvenTree/settings/report.html
@@ -0,0 +1,22 @@
+{% extends "InvenTree/settings/settings.html" %}
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block tabs %}
+{% include "InvenTree/settings/tabs.html" with tab='report' %}
+{% endblock %}
+
+{% block subtitle %}
+{% trans "Report Settings" %}
+{% endblock %}
+
+{% block settings %}
+
+<table class='table table-striped table-condensed'>
+    {% include "InvenTree/settings/header.html" %}
+    <tbody>
+        {% include "InvenTree/settings/setting.html" with key="REPORT_ENABLE_TEST_REPORT" %}
+    </tbody>
+</table>
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/settings/tabs.html b/InvenTree/templates/InvenTree/settings/tabs.html
index ff2bcdb61e..bb660519b8 100644
--- a/InvenTree/templates/InvenTree/settings/tabs.html
+++ b/InvenTree/templates/InvenTree/settings/tabs.html
@@ -15,6 +15,9 @@
     <li {% if tab == 'global' %} class='active' {% endif %}>
         <a href='{% url "settings-global" %}'><span class='fas fa-globe'></span> {% trans "Global" %}</a>
     </li>
+    <li {% if tab == 'report' %} class='active' {% endif %}>
+        <a href='{% url "settings-report" %}'><span class='fas fa-file-pdf'></span> {% trans "Report" %}</a>
+    </li>
     <li{% ifequal tab 'category' %} class='active'{% endifequal %}>
         <a href="{% url 'settings-category' %}"><span class='fa fa-sitemap'></span> {% trans "Categories" %}</a>
     </li>
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index d2b8226982..c1640892de 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -3,6 +3,7 @@
 {% load inventree_extras %}
 
 {% settings_value 'BARCODE_ENABLE' as barcodes %}
+{% settings_value 'REPORT_ENABLE_TEST_REPORT' as test_report_enabled %}
 
 <!DOCTYPE html>
 <html lang="en">
diff --git a/InvenTree/templates/stock_table.html b/InvenTree/templates/stock_table.html
index 4caf2f59fd..8eff0f4aed 100644
--- a/InvenTree/templates/stock_table.html
+++ b/InvenTree/templates/stock_table.html
@@ -38,7 +38,9 @@
                 </button>
                 <ul class='dropdown-menu'>
                     <li><a href='#' id='multi-item-print-label' title='{% trans "Print labels" %}'><span class='fas fa-tags'></span> {% trans "Print labels" %}</a></li>
+                    {% if test_report_enabled %}
                     <li><a href='#' id='multi-item-print-test-report' title='{% trans "Print test reports" %}'><span class='fas fa-file-pdf'></span> {% trans "Print test reports" %}</a></li>
+                    {% endif %}
                 </ul>
             </div>
             {% if roles.stock.change or roles.stock.delete %}