diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87f8408df9..3ec8fb82f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,7 @@ shellcheck:
     - SCRIPTS+="src/bin/netconf/tests/shtests/netconf_tests.sh.in "
     - SCRIPTS+="src/bin/shell/tests/basic_auth_tests.sh.in "
     - SCRIPTS+="src/bin/shell/tests/shell_process_tests.sh.in "
+    - SCRIPTS+="src/lib/asiolink/tests/process_spawn_app.sh.in "
     - SCRIPTS+="src/lib/log/tests/buffer_logger_test.sh.in "
     - SCRIPTS+="src/lib/log/tests/console_test.sh.in "
     - SCRIPTS+="src/lib/log/tests/destination_test.sh.in "
@@ -44,7 +45,6 @@ shellcheck:
     - SCRIPTS+="src/lib/log/tests/severity_test.sh.in "
     - SCRIPTS+="src/lib/testutils/dhcp_test_lib.sh.in "
     - SCRIPTS+="src/lib/testutils/xml_reporting_test_lib.sh.in "
-    - SCRIPTS+="src/lib/util/tests/process_spawn_app.sh.in "
     - SCRIPTS+="src/hooks/dhcp/run_script/tests/run_script_test.sh.in "
     - SCRIPTS+="src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh.in "
     - SCRIPTS+="src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in "
diff --git a/doc/sphinx/arm/hooks.rst b/doc/sphinx/arm/hooks.rst
index 7fb8435315..e31bf6450e 100644
--- a/doc/sphinx/arm/hooks.rst
+++ b/doc/sphinx/arm/hooks.rst
@@ -2943,14 +2943,16 @@ following:
 The ``network6-subnet-del`` command uses exactly the same syntax for
 both the command and the response.
 
+
 .. include:: hooks-bootp.rst
-.. include:: hooks-class-cmds.rst
 .. include:: hooks-cb-cmds.rst
+.. include:: hooks-class-cmds.rst
 .. include:: hooks-ha.rst
-.. include:: hooks-stat-cmds.rst
-.. include:: hooks-radius.rst
 .. include:: hooks-host-cache.rst
 .. include:: hooks-lease-query.rst
+.. include:: hooks-radius.rst
+.. include:: hooks-run-script.rst
+.. include:: hooks-stat-cmds.rst
 
 
 .. _user-context-hooks:
diff --git a/src/hooks/dhcp/run_script/tests/run_script_unittests.cc b/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
index a7d42b35f8..5e3007d63f 100644
--- a/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
+++ b/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
@@ -713,14 +713,19 @@ public:
     void checkScriptResult() {
         ifstream test_log;
         vector<string> extracted_lines;
-        sleep(1);
-        test_log.open(TEST_LOG_FILE);
-        if (!test_log.fail()) {
-            string line;
-            while (getline(test_log, line)) {
-                extracted_lines.push_back(line) ;
+        time_t now(time(NULL));
+        while (true) {
+            test_log.open(TEST_LOG_FILE);
+            if (!test_log.fail()) {
+                string line;
+                while (getline(test_log, line)) {
+                    extracted_lines.push_back(line) ;
+                }
+                test_log.close();
+                break;
             }
-            test_log.close();
+            ASSERT_LT(time(NULL), now + 3) << "timeout";
+            usleep(100000);
         }
         ASSERT_EQ(join(extracted_lines), "SUCCESS\n");
     }
diff --git a/src/lib/asiolink/tests/Makefile.am b/src/lib/asiolink/tests/Makefile.am
index 4d3cea43c9..e51244bae3 100644
--- a/src/lib/asiolink/tests/Makefile.am
+++ b/src/lib/asiolink/tests/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(srcdir)/testdata\"
 AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/asiolink/tests\"
-AM_CPPFLAGS += -DTEST_DATA_TOPBUILDDIR=\"$(abs_top_builddir)\"
+AM_CPPFLAGS += -DTEST_SCRIPT_SH=\"$(abs_top_builddir)/src/lib/asiolink/tests/process_spawn_app.sh\"
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)