diff --git a/.gitignore b/.gitignore
index 9a36fc34..7bdc9e62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/optee-utee/Cargo.lock
-/optee-teec/Cargo.lock
+/Cargo.lock
 /examples/**/proto/Cargo.lock
 *.rs.bk
 .user_ta_header.o.d
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 00000000..057e35eb
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,44 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+[workspace]
+# The -sys and macros crates would included in the workspace transitively even
+# if not listed, but list them anyway for completeness.
+members = [
+    "optee-teec",
+    "optee-teec/macros",
+    "optee-teec/optee-teec-sys",
+    "optee-teec/systest",
+    "optee-utee",
+    "optee-utee/macros",
+    "optee-utee/optee-utee-sys",
+    "optee-utee/systest",
+]
+
+# Don't try to build crates requiring Xargo on a workspace-level "cargo build",
+# since they'll just fail.
+default-members = [
+    "optee-teec",
+    "optee-teec/systest",
+]
+
+exclude = [
+    # OP-TEE contains no Rust code, but exclude it in case future versions do.
+    "optee",
+    "rust",
+    "examples",
+]
diff --git a/optee-teec/Cargo.toml b/optee-teec/Cargo.toml
index fe09b698..92c10041 100644
--- a/optee-teec/Cargo.toml
+++ b/optee-teec/Cargo.toml
@@ -30,6 +30,3 @@ optee-teec-macros = { path = "macros" }
 libc = "0.2"
 uuid = "0.7"
 hex = "0.3"
-
-[workspace]
-members = ['systest']
diff --git a/optee-teec/systest/Cargo.toml b/optee-teec/systest/Cargo.toml
index 81ed1131..a37a9f3d 100644
--- a/optee-teec/systest/Cargo.toml
+++ b/optee-teec/systest/Cargo.toml
@@ -16,7 +16,7 @@
 # under the License.
 
 [package]
-name = "systest"
+name = "optee-teec-systest"
 version = "0.2.0"
 authors = ["Teaclave Contributors <dev@teaclave.apache.org>"]
 license = "Apache-2.0"
diff --git a/optee-utee/Cargo.toml b/optee-utee/Cargo.toml
index c0ea0f25..21a1ff3f 100644
--- a/optee-utee/Cargo.toml
+++ b/optee-utee/Cargo.toml
@@ -31,6 +31,3 @@ libc = { path = "../rust/libc", version = "=0.2.99" }
 bitflags = "=1.0.4"
 uuid = { version = "0.8", default-features = false }
 hex = "0.3"
-
-[workspace]
-members = ['systest']
diff --git a/optee-utee/systest/Cargo.toml b/optee-utee/systest/Cargo.toml
index d714db55..96a6df36 100644
--- a/optee-utee/systest/Cargo.toml
+++ b/optee-utee/systest/Cargo.toml
@@ -16,7 +16,7 @@
 # under the License.
 
 [package]
-name = "systest"
+name = "optee-utee-systest"
 version = "0.2.0"
 authors = ["Teaclave Contributors <dev@teaclave.apache.org>"]
 license = "Apache-2.0"