diff --git a/InvenTree/build/tests.py b/InvenTree/build/tests.py
index 1918ce9b27..1030a4e198 100644
--- a/InvenTree/build/tests.py
+++ b/InvenTree/build/tests.py
@@ -6,6 +6,8 @@ from django.test import TestCase
 from .models import Build
 from part.models import Part
 
+from InvenTree.status_codes import BuildStatus
+
 
 class BuildTestSimple(TestCase):
 
@@ -14,14 +16,14 @@ class BuildTestSimple(TestCase):
                                    description='Simple description')
         Build.objects.create(part=part,
                              batch='B1',
-                             status=Build.PENDING,
+                             status=BuildStatus.PENDING,
                              title='Building 7 parts',
                              quantity=7,
                              notes='Some simple notes')
 
         Build.objects.create(part=part,
                              batch='B2',
-                             status=Build.COMPLETE,
+                             status=BuildStatus.COMPLETE,
                              title='Building 21 parts',
                              quantity=21,
                              notes='Some simple notes')
diff --git a/InvenTree/build/views.py b/InvenTree/build/views.py
index ace53ecca6..028546a6d4 100644
--- a/InvenTree/build/views.py
+++ b/InvenTree/build/views.py
@@ -15,6 +15,7 @@ from stock.models import StockLocation, StockItem
 
 from InvenTree.views import AjaxUpdateView, AjaxCreateView, AjaxDeleteView
 from InvenTree.helpers import str2bool
+from InvenTree.status_codes import BuildStatus
 
 
 class BuildIndex(ListView):
@@ -32,10 +33,12 @@ class BuildIndex(ListView):
 
         context = super(BuildIndex, self).get_context_data(**kwargs).copy()
 
-        context['active'] = self.get_queryset().filter(status__in=[Build.PENDING, ])
+        context['BuildStatus'] = BuildStatus
 
-        context['completed'] = self.get_queryset().filter(status=Build.COMPLETE)
-        context['cancelled'] = self.get_queryset().filter(status=Build.CANCELLED)
+        context['active'] = self.get_queryset().filter(status__in=BuildStatus.ACTIVE_CODES)
+
+        context['completed'] = self.get_queryset().filter(status=BuildStatus.COMPLETE)
+        context['cancelled'] = self.get_queryset().filter(status=BuildStatus.CANCELLED)
 
         return context
 
diff --git a/InvenTree/templates/build_status.html b/InvenTree/templates/build_status.html
index 793e3ea231..b18b81e16f 100644
--- a/InvenTree/templates/build_status.html
+++ b/InvenTree/templates/build_status.html
@@ -1,10 +1,10 @@
-{% if build.status == build.PENDING %}
+{% if build.status == BuildStatus.PENDING %}
 <span class='label label-large label-info'>
-{% elif build.status == build.ALLOCATED %}
+{% elif build.status == BuildStatus.ALLOCATED %}
 <span class='label label-large label-primary'>
-{% elif build.status == build.CANCELLED %}
+{% elif build.status == BuildStatus.CANCELLED %}
 <span class='label label-large label-danger'>
-{% elif build.status == build.COMPLETE %}
+{% elif build.status == BuildStatus.COMPLETE %}
 <span class='label label-large label-success'>
 {% endif %}
 {{ build.get_status_display }}