diff --git a/include/spdk_internal/mock.h b/include/spdk_internal/mock.h
index aa3893af3..a28e3df4c 100644
--- a/include/spdk_internal/mock.h
+++ b/include/spdk_internal/mock.h
@@ -121,4 +121,6 @@ DECLARE_WRAPPER(pthread_mutex_init, int,
 DECLARE_WRAPPER(pthread_mutexattr_init, int,
 		(pthread_mutexattr_t *attr));
 
+DECLARE_WRAPPER(pthread_self, pthread_t, (void));
+
 #endif /* SPDK_INTERNAL_MOCK_H */
diff --git a/lib/ut_mock/mock.c b/lib/ut_mock/mock.c
index e642c7680..1afb56699 100644
--- a/lib/ut_mock/mock.c
+++ b/lib/ut_mock/mock.c
@@ -33,6 +33,8 @@
 
 #include "spdk_internal/mock.h"
 
+DEFINE_WRAPPER(calloc, void *, (size_t nmemb, size_t size), (nmemb, size), (void *)MOCK_PASS_THRU)
+
 DEFINE_WRAPPER(pthread_mutex_init, int,
 	       (pthread_mutex_t *mtx, const pthread_mutexattr_t *attr),
 	       (mtx, attr), MOCK_PASS_THRU)
@@ -40,4 +42,4 @@ DEFINE_WRAPPER(pthread_mutex_init, int,
 DEFINE_WRAPPER(pthread_mutexattr_init, int,
 	       (pthread_mutexattr_t *attr), (attr), MOCK_PASS_THRU)
 
-DEFINE_WRAPPER(calloc, void *, (size_t nmemb, size_t size), (nmemb, size), (void *)MOCK_PASS_THRU)
+DEFINE_WRAPPER(pthread_self, pthread_t, (void), (), (pthread_t)MOCK_PASS_THRU)
diff --git a/mk/spdk.mock.unittest.mk b/mk/spdk.mock.unittest.mk
index 58a36aeec..dff2c9690 100644
--- a/mk/spdk.mock.unittest.mk
+++ b/mk/spdk.mock.unittest.mk
@@ -30,5 +30,8 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-LDFLAGS += -Wl,--wrap,pthread_mutexattr_init -Wl,--wrap,pthread_mutex_init \
-	   -Wl,--wrap,calloc
+LDFLAGS += \
+	-Wl,--wrap,calloc \
+	-Wl,--wrap,pthread_mutexattr_init \
+	-Wl,--wrap,pthread_mutex_init \
+	-Wl,--wrap,pthread_self