diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh
index 367d96f7f418755d0f28a645fb4167b233dbb7cb..57e4fff1458ead7733250ad130da5ff1602a1bdb 100755
--- a/sbin/run_integration_test.sh
+++ b/sbin/run_integration_test.sh
@@ -32,7 +32,8 @@ function integration_test {
     echo "make restart ${restarts[@]} ..."
     make restart "${restarts[@]}"
   fi
-  sleep 10
+  #TODO(L2SS-988): Use healthcheck to wait for containers to become ready
+  sleep 30
   echo "make integration ${1} ..."
   make integration "${1}"
 }
@@ -105,6 +106,7 @@ integration_test dummy
 make start elk
 
 # Give elk time to start
+# TODO(L2SS-988): Use a nicer more reliable mechanism
 sleep 10
 
 # Update the dsconfig
@@ -128,7 +130,7 @@ make start $DEVICES
 make start archiver-timescale
 
 # Give devices time to restart
-# TODO(Corne Lukken): Use a nicer more reliable mechanism
+# TODO(L2SS-988): Use a nicer more reliable mechanism
 sleep 70
 
 # Give archiver-timescale time to start
diff --git a/tangostationcontrol/docs/docs-requirements.txt b/tangostationcontrol/docs/docs-requirements.txt
index 689980c4d157bdfe611e0838183adc699c99457c..3a910678911865bf529d594c626ee1d8c2c5860e 100644
--- a/tangostationcontrol/docs/docs-requirements.txt
+++ b/tangostationcontrol/docs/docs-requirements.txt
@@ -1,2 +1,3 @@
+importlib-metadata<2.0.0,>=0.12;python_version<"3.8"
 sphinx>=4.3.2 # BSD
 sphinx-rtd-theme>=1.0.0 # MIT
\ No newline at end of file
diff --git a/tangostationcontrol/requirements.txt b/tangostationcontrol/requirements.txt
index 690513a0d46fdd97e9353275918fc20e1d174fd9..1101bd06624daa6fb01aaaa1a6aab0e5c8a82ddc 100644
--- a/tangostationcontrol/requirements.txt
+++ b/tangostationcontrol/requirements.txt
@@ -2,6 +2,7 @@
 # order of appearance. Changing the order has an impact on the overall
 # integration process, which may cause wedges in the gate later.
 
+importlib-metadata<2.0.0,>=0.12;python_version<"3.8"
 lofar-station-client@git+https://git.astron.nl/lofar2.0/lofar-station-client@0.6.0
 numpy
 mock
diff --git a/tangostationcontrol/test-requirements.txt b/tangostationcontrol/test-requirements.txt
index dbd81d74d77b574e349b3bb7203284fc41b401cf..6c383060d28b0fbbe7154677d9993822358baa6d 100644
--- a/tangostationcontrol/test-requirements.txt
+++ b/tangostationcontrol/test-requirements.txt
@@ -2,6 +2,7 @@
 # order of appearance. Changing the order has an impact on the overall
 # integration process, which may cause wedges in the gate later.
 
+importlib-metadata<2.0.0,>=0.12;python_version<"3.8"
 asynctest>=0.13.0 # Apache-2.0
 bandit>=1.6.0 # Apache-2.0
 virtualenv>=20.16.0 # MIT