diff --git a/Cargo.toml b/Cargo.toml
index c8dfd7aa17..cc8e830f10 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,6 +38,7 @@ members = [
     "crates/diem-retrier",
     "crates/diem-temppath",
     "crates/diem-time-service",
+    "crates/diem-wallet",
     "crates/diem-workspace-hack",
     "crates/fallible",
     "crates/num-variants",
@@ -183,7 +184,6 @@ members = [
     "storage/storage-interface",
     "storage/storage-service",
     "testsuite/cli",
-    "testsuite/cli/diem-wallet",
     "testsuite/diem-fuzzer",
     "testsuite/diem-fuzzer/fuzz",
     "testsuite/diem-swarm",
diff --git a/testsuite/cli/diem-wallet/Cargo.toml b/crates/diem-wallet/Cargo.toml
similarity index 65%
rename from testsuite/cli/diem-wallet/Cargo.toml
rename to crates/diem-wallet/Cargo.toml
index a76263b624..684d39f544 100644
--- a/testsuite/cli/diem-wallet/Cargo.toml
+++ b/crates/diem-wallet/Cargo.toml
@@ -19,10 +19,10 @@ pbkdf2 = "0.7.3"
 serde = "1.0.124"
 sha2 = "0.9.3"
 thiserror = "1.0.24"
-diem-crypto = { path = "../../../crates/diem-crypto", features = ["fuzzing"] }
-diem-temppath = { path = "../../../crates/diem-temppath/" }
-diem-types = { path = "../../../types" }
-diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" }
+diem-crypto = { path = "../diem-crypto", features = ["fuzzing"] }
+diem-temppath = { path = "../diem-temppath" }
+diem-types = { path = "../../types" }
+diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" }
 mirai-annotations = "1.10.1"
 
 [features]
diff --git a/testsuite/cli/diem-wallet/README.md b/crates/diem-wallet/README.md
similarity index 100%
rename from testsuite/cli/diem-wallet/README.md
rename to crates/diem-wallet/README.md
diff --git a/testsuite/cli/diem-wallet/src/error.rs b/crates/diem-wallet/src/error.rs
similarity index 100%
rename from testsuite/cli/diem-wallet/src/error.rs
rename to crates/diem-wallet/src/error.rs
diff --git a/testsuite/cli/diem-wallet/src/internal_macros.rs b/crates/diem-wallet/src/internal_macros.rs
similarity index 100%
rename from testsuite/cli/diem-wallet/src/internal_macros.rs
rename to crates/diem-wallet/src/internal_macros.rs
diff --git a/testsuite/cli/diem-wallet/src/io_utils.rs b/crates/diem-wallet/src/io_utils.rs
similarity index 100%
rename from testsuite/cli/diem-wallet/src/io_utils.rs
rename to crates/diem-wallet/src/io_utils.rs
diff --git a/testsuite/cli/diem-wallet/src/key_factory.rs b/crates/diem-wallet/src/key_factory.rs
similarity index 100%
rename from testsuite/cli/diem-wallet/src/key_factory.rs
rename to crates/diem-wallet/src/key_factory.rs
diff --git a/testsuite/cli/diem-wallet/src/lib.rs b/crates/diem-wallet/src/lib.rs
similarity index 100%
rename from testsuite/cli/diem-wallet/src/lib.rs
rename to crates/diem-wallet/src/lib.rs
diff --git a/testsuite/cli/diem-wallet/src/mnemonic.rs b/crates/diem-wallet/src/mnemonic.rs
similarity index 100%
rename from testsuite/cli/diem-wallet/src/mnemonic.rs
rename to crates/diem-wallet/src/mnemonic.rs
diff --git a/testsuite/cli/diem-wallet/src/wallet_library.rs b/crates/diem-wallet/src/wallet_library.rs
similarity index 100%
rename from testsuite/cli/diem-wallet/src/wallet_library.rs
rename to crates/diem-wallet/src/wallet_library.rs
diff --git a/testsuite/cli/Cargo.toml b/testsuite/cli/Cargo.toml
index 206ed78ac8..b5bb037424 100644
--- a/testsuite/cli/Cargo.toml
+++ b/testsuite/cli/Cargo.toml
@@ -29,7 +29,7 @@ generate-key = { path = "../../config/generate-key" }
 crash-handler = { path = "../../crates/crash-handler" }
 diem-crypto = { path = "../../crates/diem-crypto" }
 bcs = "0.1.2"
-diem-wallet = { path = "diem-wallet" }
+diem-wallet = { path = "../../crates/diem-wallet" }
 diem-client = { path = "../../crates/diem-client" }
 diem-infallible = { path = "../../crates/diem-infallible" }
 diem-logger =  { path = "../../crates/diem-logger" }