diff --git a/Cargo.lock b/Cargo.lock
index 936033d76..a4668b0c1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1469,7 +1469,7 @@ dependencies = [
 name = "vhost_user_net"
 version = "0.1.0"
 dependencies = [
- "bitflags 1.2.1",
+ "clap",
  "epoll",
  "libc",
  "log 0.4.8",
diff --git a/scripts/run_cargo_tests.sh b/scripts/run_cargo_tests.sh
index 1abbc7acc..5b9b51b10 100755
--- a/scripts/run_cargo_tests.sh
+++ b/scripts/run_cargo_tests.sh
@@ -12,17 +12,17 @@ time which cargo-audit || cargo install cargo-audit
 # Run cargo builds and checks
 time cargo clippy --all-targets --all-features -- -D warnings
 time cargo rustc --bin cloud-hypervisor -- -D warnings
-time cargo rustc --bin vhost_user_net -- -D warnings
+time cargo rustc -p vhost_user_net --bin vhost_user_net -- -D warnings
 time cargo test
 time cargo audit
 time cargo clippy --all-targets --no-default-features --features "pci,acpi" -- -D warnings
 time cargo rustc --bin cloud-hypervisor --no-default-features --features "pci,acpi"  -- -D warnings
-time cargo rustc --bin vhost_user_net --no-default-features --features "pci,acpi"  -- -D warnings
+time cargo rustc -p vhost_user_net --bin vhost_user_net --no-default-features --features "pci,acpi"  -- -D warnings
 time cargo clippy --all-targets --no-default-features --features "pci" -- -D warnings
 time cargo rustc --bin cloud-hypervisor --no-default-features --features "pci"  -- -D warnings
-time cargo rustc --bin vhost_user_net --no-default-features --features "pci"  -- -D warnings
+time cargo rustc -p vhost_user_net --bin vhost_user_net --no-default-features --features "pci"  -- -D warnings
 time cargo clippy --all-targets --no-default-features --features "mmio" -- -D warnings
 time cargo rustc --bin cloud-hypervisor --no-default-features --features "mmio"  -- -D warnings
-time cargo rustc --bin vhost_user_net --no-default-features --features "mmio"  -- -D warnings
+time cargo rustc -p vhost_user_net --bin vhost_user_net --no-default-features --features "mmio"  -- -D warnings
 time cargo fmt -- --check
 time cargo build --all --release
diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml
index 7361f42e8..61acfced3 100644
--- a/vhost_user_net/Cargo.toml
+++ b/vhost_user_net/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["The Cloud Hypervisor Authors"]
 edition = "2018"
 
 [dependencies]
-bitflags = "1.1.0"
+clap = { version = "2.33.1", features=["wrap_help"] }
 epoll = ">=4.0.1"
 libc = "0.2.71"
 log = "0.4.8"
diff --git a/src/bin/vhost_user_net.rs b/vhost_user_net/src/main.rs
similarity index 100%
rename from src/bin/vhost_user_net.rs
rename to vhost_user_net/src/main.rs