diff --git a/validate/gst/validate/gst-validate-scenario.c b/validate/gst/validate/gst-validate-scenario.c
index 27d5f02e54..fa7be9d664 100644
--- a/validate/gst/validate/gst-validate-scenario.c
+++ b/validate/gst/validate/gst-validate-scenario.c
@@ -2569,9 +2569,14 @@ appsrc_push_chain_wrapper (GstPad * pad, GstObject * parent, GstBuffer * buffer,
     gpointer * user_data, gboolean * remove_wrapper)
 {
   GstValidateAction *action = (GstValidateAction *) user_data;
-  GstFlowReturn ret = pad->chainfunc (pad, parent, buffer);
+  GstValidateScenario *scenario = gst_validate_action_get_scenario (action);
+  GstFlowReturn ret;
+  GST_VALIDATE_SCENARIO_EOS_HANDLING_LOCK (scenario);
+  ret = pad->chainfunc (pad, parent, buffer);
   gst_validate_action_set_done (action);
   *remove_wrapper = TRUE;
+  GST_VALIDATE_SCENARIO_EOS_HANDLING_UNLOCK (scenario);
+  g_object_unref (scenario);
   return ret;
 }
 
@@ -3015,6 +3020,8 @@ message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario)
       GstValidateActionType *stop_action_type;
       GstStructure *s;
 
+      GST_VALIDATE_SCENARIO_EOS_HANDLING_LOCK (scenario);
+
       if (!is_error) {
         priv->got_eos = TRUE;
         if (priv->message_type) {
@@ -3023,6 +3030,7 @@ message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario)
             GST_DEBUG_OBJECT (scenario,
                 "Waiting for a message and got a next action"
                 " to execute, letting it a chance!");
+            GST_VALIDATE_SCENARIO_EOS_HANDLING_UNLOCK (scenario);
             goto done;
           } else {
             /* Clear current message wait if waiting for EOS */
@@ -3094,6 +3102,7 @@ message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario)
       gst_validate_execute_action (stop_action_type, stop_action);
       gst_mini_object_unref (GST_MINI_OBJECT (stop_action));
 
+      GST_VALIDATE_SCENARIO_EOS_HANDLING_UNLOCK (scenario);
       break;
     }
     case GST_MESSAGE_BUFFERING:
diff --git a/validate/gst/validate/gst-validate-scenario.h b/validate/gst/validate/gst-validate-scenario.h
index 94e49af50f..e67a6be132 100644
--- a/validate/gst/validate/gst-validate-scenario.h
+++ b/validate/gst/validate/gst-validate-scenario.h
@@ -254,9 +254,25 @@ struct _GstValidateScenario
   /*< private >*/
   GstValidateScenarioPrivate *priv;
 
-  gpointer _gst_reserved[GST_PADDING + 1];
+  union {
+    gpointer _gst_reserved[GST_PADDING + 1];
+    struct {
+      GMutex eos_handling_lock;
+    } abi;
+  } ABI;
 };
 
+/* Some actions may trigger EOS during their execution. Unlocked this
+ * could cause a race condition as the main thread may terminate the test
+ * in response to the EOS message in the bus while the action is still
+ * going in a different thread.
+ * To avoid this, the handling of the EOS message is protected with this
+ * lock. Actions expecting to cause an EOS can hold the lock for their
+ * duration so that they are guaranteed to finish before the EOS
+ * terminates the test. */
+#define GST_VALIDATE_SCENARIO_EOS_HANDLING_LOCK(scenario) (g_mutex_lock(&(scenario)->ABI.abi.eos_handling_lock))
+#define GST_VALIDATE_SCENARIO_EOS_HANDLING_UNLOCK(scenario) (g_mutex_unlock(&(scenario)->ABI.abi.eos_handling_lock))
+
 GST_VALIDATE_API
 GType gst_validate_scenario_get_type (void);