diff --git a/test/unit/lib/scsi/lun.c/lun_ut.c b/test/unit/lib/scsi/lun.c/lun_ut.c
index e48e7a6d8..17e1bb0bc 100644
--- a/test/unit/lib/scsi/lun.c/lun_ut.c
+++ b/test/unit/lib/scsi/lun.c/lun_ut.c
@@ -39,6 +39,10 @@
 #include "scsi/lun.c"
 
 #include "spdk_internal/mock.h"
+/* These unit tests aren't multithreads, but we need to allocate threads since
+ * the lun.c code will register pollers.
+ */
+#include "common/lib/ut_multithread.c"
 
 /* Unit test bdev mockup */
 struct spdk_bdev {
@@ -57,26 +61,6 @@ struct spdk_scsi_globals g_spdk_scsi;
 static bool g_lun_execute_fail = false;
 static int g_lun_execute_status = SPDK_SCSI_TASK_PENDING;
 static uint32_t g_task_count = 0;
-static struct spdk_poller g_lun_ut_poller;
-
-struct spdk_poller *
-spdk_poller_register(spdk_poller_fn fn,
-		     void *arg,
-		     uint64_t period_microseconds)
-{
-	return &g_lun_ut_poller;
-}
-
-void
-spdk_poller_unregister(struct spdk_poller **ppoller)
-{
-	if (ppoller != NULL) {
-		*ppoller = NULL;
-	}
-}
-
-DEFINE_STUB_V(spdk_thread_send_msg,
-	      (const struct spdk_thread *thread, spdk_msg_fn fn, void *ctx));
 
 struct spdk_trace_histories *g_trace_histories;
 
@@ -84,10 +68,6 @@ DEFINE_STUB_V(_spdk_trace_record,
 	      (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,
 	       uint32_t size, uint64_t object_id, uint64_t arg1));
 
-DEFINE_STUB(spdk_get_ticks, uint64_t, (void), 0);
-
-DEFINE_STUB(spdk_get_ticks_hz, uint64_t, (void), 0);
-
 static void
 spdk_lun_ut_cpl_task(struct spdk_scsi_task *task)
 {
@@ -109,32 +89,6 @@ ut_init_task(struct spdk_scsi_task *task)
 	g_task_count++;
 }
 
-void *
-spdk_dma_malloc(size_t size, size_t align, uint64_t *phys_addr)
-{
-	void *buf = malloc(size);
-	if (phys_addr) {
-		*phys_addr = (uint64_t)buf;
-	}
-	return buf;
-}
-
-void *
-spdk_dma_zmalloc(size_t size, size_t align, uint64_t *phys_addr)
-{
-	void *buf = calloc(size, 1);
-	if (phys_addr) {
-		*phys_addr = (uint64_t)buf;
-	}
-	return buf;
-}
-
-void
-spdk_dma_free(void *buf)
-{
-	free(buf);
-}
-
 void
 spdk_bdev_free_io(struct spdk_bdev_io *bdev_io)
 {
@@ -187,13 +141,6 @@ spdk_bdev_scsi_execute(struct spdk_scsi_task *task)
 DEFINE_STUB(spdk_bdev_get_io_channel, struct spdk_io_channel *,
 	    (struct spdk_bdev_desc *desc), NULL);
 
-DEFINE_STUB_V(spdk_put_io_channel, (struct spdk_io_channel *ch));
-
-DEFINE_STUB(spdk_io_channel_get_thread, struct spdk_thread *,
-	    (struct spdk_io_channel *ch), NULL);
-
-DEFINE_STUB(spdk_get_thread, struct spdk_thread *, (void), NULL);
-
 static _spdk_scsi_lun *
 lun_construct(void)
 {
@@ -701,7 +648,10 @@ main(int argc, char **argv)
 	}
 
 	CU_basic_set_mode(CU_BRM_VERBOSE);
+	allocate_threads(1);
+	set_thread(0);
 	CU_basic_run_tests();
+	free_threads();
 	num_failures = CU_get_number_of_failures();
 	CU_cleanup_registry();
 	return num_failures;
diff --git a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
index 025e3181b..918151ba1 100644
--- a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
+++ b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
@@ -35,6 +35,7 @@
 
 #include "scsi/task.c"
 #include "scsi/scsi_bdev.c"
+#include "common/lib/test_env.c"
 
 #include "spdk_cunit.h"
 
@@ -52,34 +53,6 @@ int g_scsi_cb_called = 0;
 TAILQ_HEAD(, spdk_bdev_io_wait_entry) g_io_wait_queue;
 bool g_bdev_io_pool_full = false;
 
-void *
-spdk_dma_malloc(size_t size, size_t align, uint64_t *phys_addr)
-{
-	void *buf = malloc(size);
-	if (phys_addr) {
-		*phys_addr = (uint64_t)buf;
-	}
-
-	return buf;
-}
-
-void *
-spdk_dma_zmalloc(size_t size, size_t align, uint64_t *phys_addr)
-{
-	void *buf = calloc(size, 1);
-	if (phys_addr) {
-		*phys_addr = (uint64_t)buf;
-	}
-
-	return buf;
-}
-
-void
-spdk_dma_free(void *buf)
-{
-	free(buf);
-}
-
 bool
 spdk_bdev_io_type_supported(struct spdk_bdev *bdev, enum spdk_bdev_io_type io_type)
 {