diff --git a/manage.py b/manage.py
index 33c6a136..3bbd0757 100755
--- a/manage.py
+++ b/manage.py
@@ -12,9 +12,13 @@ if __name__ == "__main__":
     else:
         os.environ.setdefault("DJANGO_SETTINGS_MODULE", "edivorce.settings.openshift")
 
-        # run npm_build (custom management command) when collectstatic is called in 
+        # run 'npm_build' (custom management command) when collectstatic is called in 
         # the S2I assemble script
         if sys.argv[1] == 'collectstatic':
             execute_from_command_line(['manage.py','npm_build'])
 
+        # run 'loaddata' before running the migrations
+        if sys.argv[1] == 'migrate':
+            execute_from_command_line(['manage.py', 'loaddata', '/opt/app-root/src/edivorce/fixtures/Question.json'])
+
     execute_from_command_line(sys.argv)