diff --git a/src/unit-tests/osfile-test/ut_osfile_test.c b/src/unit-tests/osfile-test/ut_osfile_test.c
index 0cdcac10e..d5231b780 100644
--- a/src/unit-tests/osfile-test/ut_osfile_test.c
+++ b/src/unit-tests/osfile-test/ut_osfile_test.c
@@ -78,18 +78,17 @@ int32 UT_os_setup_fs()
     if (res != OS_SUCCESS)
     {
         UtPrintf("OS_mkfs() returns %d\n", (int)res);
-        goto UT_os_setup_fs_exit_tag;
     }
-
-    res = OS_mount(g_devName, g_mntName);
-    if (res != OS_SUCCESS)
+    else
     {
-        UtPrintf("OS_mount() returns %d\n", (int)res);
-        OS_rmfs(g_devName);
-        goto UT_os_setup_fs_exit_tag;
+        res = OS_mount(g_devName, g_mntName);
+        if (res != OS_SUCCESS)
+        {
+            UtPrintf("OS_mount() returns %d\n", (int)res);
+            OS_rmfs(g_devName);
+        }
     }
 
-UT_os_setup_fs_exit_tag:
     return res;
 }