diff --git a/sahara_dashboard/api/sahara.py b/sahara_dashboard/api/sahara.py
index 83600101..5c95c66a 100644
--- a/sahara_dashboard/api/sahara.py
+++ b/sahara_dashboard/api/sahara.py
@@ -492,6 +492,10 @@ def job_get_configs(request, job_type):
 def job_execution_create(request, job_id, cluster_id,
                          input_id, output_id, configs,
                          interface, is_public=None, is_protected=None):
+    if input_id in [None, "", "None"]:
+        input_id = None
+    if output_id in [None, "", "None"]:
+        output_id = None
     return client(request).job_executions.create(
         job_id=job_id,
         cluster_id=cluster_id,
diff --git a/sahara_dashboard/test/integration_tests/pages/mixins.py b/sahara_dashboard/test/integration_tests/pages/mixins.py
index b88c2e8a..3ef223c5 100644
--- a/sahara_dashboard/test/integration_tests/pages/mixins.py
+++ b/sahara_dashboard/test/integration_tests/pages/mixins.py
@@ -19,7 +19,6 @@ class TableCreateWithPluginMixin(object):
     PLUGIN_CHOOSE_FORM_FIELDS = (
         'vanilla_version',
         'cdh_version',
-        'hdp_version',
         'plugin_name',
         'spark_version',
         'fake_version',
diff --git a/tools/gate/integration/pre_test_hook.sh b/tools/gate/integration/pre_test_hook.sh
index a6ec06df..e744c727 100755
--- a/tools/gate/integration/pre_test_hook.sh
+++ b/tools/gate/integration/pre_test_hook.sh
@@ -4,3 +4,6 @@
 
 set -ex
 source commons $@
+
+cd /opt/stack/new/horizon/openstack_dashboard/local/local_settings.d
+mv _20_integration_tests_scaffolds.py.example _20_integration_tests_scaffolds.py
\ No newline at end of file