diff --git a/src/bsp/generic-vxworks/src/bsp_start.c b/src/bsp/generic-vxworks/src/bsp_start.c
index caa33a333..07e9e107c 100644
--- a/src/bsp/generic-vxworks/src/bsp_start.c
+++ b/src/bsp/generic-vxworks/src/bsp_start.c
@@ -103,8 +103,8 @@ int OS_BSPMain(void)
     /*
      * Initialize the low level access sem
      */
-    OS_BSP_GenericVxWorksGlobal.AccessMutex =
-        semMInitialize(OS_BSP_GenericVxWorksGlobal.AccessMutexMem, SEM_Q_PRIORITY | SEM_INVERSION_SAFE);
+    OS_BSP_GenericVxWorksGlobal.AccessMutex = semMInitialize(OS_BSP_GenericVxWorksGlobal.AccessMutexMem,
+                                                             SEM_Q_PRIORITY | SEM_INVERSION_SAFE | SEM_DELETE_SAFE);
 
     if (OS_BSP_GenericVxWorksGlobal.AccessMutex == (SEM_ID)0)
     {
diff --git a/src/unit-tests/oscore-test/ut_oscore_task_test.c b/src/unit-tests/oscore-test/ut_oscore_task_test.c
index 5bb7daac1..90570478d 100644
--- a/src/unit-tests/oscore-test/ut_oscore_task_test.c
+++ b/src/unit-tests/oscore-test/ut_oscore_task_test.c
@@ -163,10 +163,10 @@ void UT_os_task_create_test()
         {
             break;
         }
-    }
 
-    /* Delay to let child tasks run */
-    OS_TaskDelay(500);
+        /* Delay to let child task run */
+        OS_TaskDelay(200);
+    }
 
     /* Reset test environment */
     for (i = 0; i < OS_MAX_TASKS; i++)