diff --git a/language/move-analyzer/Cargo.toml b/language/move-analyzer/Cargo.toml
index a454f24521..9cd5c57495 100644
--- a/language/move-analyzer/Cargo.toml
+++ b/language/move-analyzer/Cargo.toml
@@ -26,3 +26,7 @@ move-compiler = { path = "../move-compiler" }
 move-ir-types = { path = "../move-ir/types" }
 move-package = { path = "../tools/move-package" }
 move-symbol-pool = { path = "../move-symbol-pool" }
+
+[features]
+address20 = ["move-compiler/address20"]
+address32 = ["move-compiler/address32"]
diff --git a/language/move-compiler/Cargo.toml b/language/move-compiler/Cargo.toml
index 320cfdc27f..0eb2706c1f 100644
--- a/language/move-compiler/Cargo.toml
+++ b/language/move-compiler/Cargo.toml
@@ -39,3 +39,7 @@ datatest-stable = "0.1.1"
 [[test]]
 name = "move_check_testsuite"
 harness = false
+
+[features]
+address20 = ["move-core-types/address20"]
+address32 = ["move-core-types/address32"]