diff --git a/lib/virtio/Makefile b/lib/virtio/Makefile
index 8af5d8bc5..8ea173c3b 100644
--- a/lib/virtio/Makefile
+++ b/lib/virtio/Makefile
@@ -38,8 +38,7 @@ SO_VER := 2
 SO_MINOR := 0
 
 CFLAGS += $(ENV_CFLAGS)
-C_SRCS = virtio.c virtio_user.c virtio_pci.c
-C_SRCS += virtio_user/vhost_user.c
+C_SRCS = virtio.c virtio_user.c virtio_pci.c vhost_user.c
 LIBNAME = virtio
 
 SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_virtio.map)
diff --git a/lib/virtio/virtio_user/vhost_user.c b/lib/virtio/vhost_user.c
similarity index 99%
rename from lib/virtio/virtio_user/vhost_user.c
rename to lib/virtio/vhost_user.c
index e84abec9c..b3da9d988 100644
--- a/lib/virtio/virtio_user/vhost_user.c
+++ b/lib/virtio/vhost_user.c
@@ -33,7 +33,7 @@
 
 #include "spdk/stdinc.h"
 
-#include "vhost.h"
+#include "vhost_user.h"
 
 #include "spdk/string.h"
 #include "spdk_internal/vhost_user.h"
diff --git a/lib/virtio/virtio_user/vhost.h b/lib/virtio/vhost_user.h
similarity index 100%
rename from lib/virtio/virtio_user/vhost.h
rename to lib/virtio/vhost_user.h
diff --git a/lib/virtio/virtio_user.c b/lib/virtio/virtio_user.c
index ad9f715d3..4f4932db9 100644
--- a/lib/virtio/virtio_user.c
+++ b/lib/virtio/virtio_user.c
@@ -35,7 +35,7 @@
 
 #include <sys/eventfd.h>
 
-#include "virtio_user/vhost.h"
+#include "vhost_user.h"
 #include "spdk/string.h"
 #include "spdk/config.h"
 
diff --git a/test/common/skipped_build_files.txt b/test/common/skipped_build_files.txt
index e2f4017db..dca967681 100644
--- a/test/common/skipped_build_files.txt
+++ b/test/common/skipped_build_files.txt
@@ -25,7 +25,7 @@ lib/rte_vhost/socket
 lib/rte_vhost/vhost
 lib/rte_vhost/vhost_user
 lib/vhost/vhost_nvme
-lib/virtio/virtio_user/vhost_user
+lib/virtio/vhost_user
 
 # Cuse related files, enable when ready.
 lib/nvme/nvme_cuse