diff --git a/Cargo.lock b/Cargo.lock
index 1e933a44d2ba6..158cdbc30fc8b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9225,9 +9225,9 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
 dependencies = [
  "console",
  "instant",
@@ -14094,7 +14094,7 @@ version = "0.39.0"
 source = "git+https://github.com/banool/self_update.git?rev=8306158ad0fd5b9d4766a3c6bf967e7ef0ea5c4b#8306158ad0fd5b9d4766a3c6bf967e7ef0ea5c4b"
 dependencies = [
  "hyper",
- "indicatif 0.17.7",
+ "indicatif 0.17.8",
  "log",
  "quick-xml 0.23.1",
  "regex",
diff --git a/aptos-move/framework/src/aptos.rs b/aptos-move/framework/src/aptos.rs
index ed0ab0e7ac0ff..fd4c6457cd672 100644
--- a/aptos-move/framework/src/aptos.rs
+++ b/aptos-move/framework/src/aptos.rs
@@ -106,6 +106,7 @@ impl ReleaseTarget {
                 with_source_maps: false,
                 with_error_map: true,
                 named_addresses: Default::default(),
+                override_std: None,
                 install_dir: None,
                 with_docs: true,
                 docgen_options: Some(DocgenOptions {
diff --git a/aptos-move/framework/src/built_package.rs b/aptos-move/framework/src/built_package.rs
index 38fa59c2b829e..44ef45eca2a74 100644
--- a/aptos-move/framework/src/built_package.rs
+++ b/aptos-move/framework/src/built_package.rs
@@ -26,7 +26,10 @@ use move_model::{
 };
 use move_package::{
     compilation::{compiled_package::CompiledPackage, package_layout::CompiledPackageLayout},
-    source_package::manifest_parser::{parse_move_manifest_string, parse_source_manifest},
+    source_package::{
+        manifest_parser::{parse_move_manifest_string, parse_source_manifest},
+        std_lib::StdVersion,
+    },
     BuildConfig, CompilerConfig, ModelConfig,
 };
 use serde::{Deserialize, Serialize};
@@ -73,6 +76,9 @@ pub struct BuildOptions {
     pub install_dir: Option<PathBuf>,
     #[clap(skip)] // TODO: have a parser for this; there is one in the CLI buts its  downstream
     pub named_addresses: BTreeMap<String, AccountAddress>,
+    /// Whether to override the standard library with the given version.
+    #[clap(long, value_parser)]
+    pub override_std: Option<StdVersion>,
     #[clap(skip)]
     pub docgen_options: Option<DocgenOptions>,
     #[clap(long)]
@@ -104,6 +110,7 @@ impl Default for BuildOptions {
             with_docs: false,
             install_dir: None,
             named_addresses: Default::default(),
+            override_std: None,
             docgen_options: None,
             // This is false by default, because it could accidentally pull new dependencies
             // while in a test (and cause some havoc)
@@ -147,6 +154,7 @@ pub fn build_model(
         full_model_generation: false,
         install_dir: None,
         test_mode: false,
+        override_std: None,
         force_recompilation: false,
         fetch_deps_only: false,
         skip_fetch_latest_git_deps: true,
@@ -190,6 +198,7 @@ impl BuiltPackage {
             full_model_generation: options.check_test_code,
             install_dir: options.install_dir.clone(),
             test_mode: false,
+            override_std: options.override_std.clone(),
             force_recompilation: false,
             fetch_deps_only: false,
             skip_fetch_latest_git_deps: options.skip_fetch_latest_git_deps,
diff --git a/crates/aptos/src/common/types.rs b/crates/aptos/src/common/types.rs
index 354a49ac0023a..d28e361a278cf 100644
--- a/crates/aptos/src/common/types.rs
+++ b/crates/aptos/src/common/types.rs
@@ -53,6 +53,7 @@ use move_core_types::{
     account_address::AccountAddress, language_storage::TypeTag, vm_status::VMStatus,
 };
 use move_model::metadata::{CompilerVersion, LanguageVersion};
+use move_package::source_package::std_lib::StdVersion;
 use serde::{Deserialize, Serialize};
 #[cfg(unix)]
 use std::os::unix::fs::OpenOptionsExt;
@@ -1048,6 +1049,10 @@ pub struct MovePackageDir {
     #[clap(long, value_parser = crate::common::utils::parse_map::<String, AccountAddressWrapper>, default_value = "")]
     pub(crate) named_addresses: BTreeMap<String, AccountAddressWrapper>,
 
+    /// Override the standard library version by mainnet/testnet/devnet
+    #[clap(long, value_parser)]
+    pub override_std: Option<StdVersion>,
+
     /// Skip pulling the latest git dependencies
     ///
     /// If you don't have a network connection, the compiler may fail due
@@ -1088,6 +1093,7 @@ impl MovePackageDir {
             package_dir: Some(package_dir),
             output_dir: None,
             named_addresses: Default::default(),
+            override_std: None,
             skip_fetch_latest_git_deps: true,
             bytecode_version: None,
             compiler_version: None,
diff --git a/crates/aptos/src/governance/mod.rs b/crates/aptos/src/governance/mod.rs
index 9f5c60681c250..883e06fa9f2c1 100644
--- a/crates/aptos/src/governance/mod.rs
+++ b/crates/aptos/src/governance/mod.rs
@@ -1001,6 +1001,7 @@ impl CliCommand<()> for GenerateUpgradeProposal {
             move_options.dev,
             move_options.skip_fetch_latest_git_deps,
             move_options.named_addresses(),
+            move_options.override_std,
             move_options.bytecode_version,
             move_options.compiler_version,
             move_options.language_version,
diff --git a/crates/aptos/src/move_tool/mod.rs b/crates/aptos/src/move_tool/mod.rs
index 5d31321d96c05..d5dee099d6d2e 100644
--- a/crates/aptos/src/move_tool/mod.rs
+++ b/crates/aptos/src/move_tool/mod.rs
@@ -50,7 +50,10 @@ use move_cli::{self, base::test::UnitTestResult};
 use move_command_line_common::env::MOVE_HOME;
 use move_core_types::{identifier::Identifier, language_storage::ModuleId, u256::U256};
 use move_model::metadata::{CompilerVersion, LanguageVersion};
-use move_package::{source_package::layout::SourcePackageLayout, BuildConfig, CompilerConfig};
+use move_package::{
+    source_package::{layout::SourcePackageLayout, std_lib::StdVersion},
+    BuildConfig, CompilerConfig,
+};
 use move_unit_test::UnitTestingConfig;
 pub use package_hooks::*;
 use serde::{Deserialize, Serialize};
@@ -331,6 +334,7 @@ impl CliCommand<Vec<String>> for CompilePackage {
                     self.move_options.dev,
                     self.move_options.skip_fetch_latest_git_deps,
                     self.move_options.named_addresses(),
+                    self.move_options.override_std.clone(),
                     self.move_options.bytecode_version,
                     self.move_options.compiler_version,
                     self.move_options.language_version,
@@ -394,6 +398,7 @@ impl CompileScript {
                 self.move_options.dev,
                 self.move_options.skip_fetch_latest_git_deps,
                 self.move_options.named_addresses(),
+                self.move_options.override_std.clone(),
                 self.move_options.bytecode_version,
                 self.move_options.compiler_version,
                 self.move_options.language_version,
@@ -611,6 +616,7 @@ impl CliCommand<&'static str> for DocumentPackage {
             with_docs: true,
             install_dir: None,
             named_addresses: move_options.named_addresses(),
+            override_std: move_options.override_std.clone(),
             docgen_options: Some(docgen_options),
             skip_fetch_latest_git_deps: move_options.skip_fetch_latest_git_deps,
             bytecode_version: move_options.bytecode_version,
@@ -682,6 +688,7 @@ impl TryInto<PackagePublicationData> for &PublishPackage {
                 self.move_options.dev,
                 self.move_options.skip_fetch_latest_git_deps,
                 self.move_options.named_addresses(),
+                self.move_options.override_std.clone(),
                 self.move_options.bytecode_version,
                 self.move_options.compiler_version,
                 self.move_options.language_version,
@@ -753,6 +760,7 @@ impl IncludedArtifacts {
         dev: bool,
         skip_fetch_latest_git_deps: bool,
         named_addresses: BTreeMap<String, AccountAddress>,
+        override_std: Option<StdVersion>,
         bytecode_version: Option<u32>,
         compiler_version: Option<CompilerVersion>,
         language_version: Option<LanguageVersion>,
@@ -769,6 +777,7 @@ impl IncludedArtifacts {
                 // Always enable error map bytecode injection
                 with_error_map: true,
                 named_addresses,
+                override_std,
                 skip_fetch_latest_git_deps,
                 bytecode_version,
                 compiler_version,
@@ -785,6 +794,7 @@ impl IncludedArtifacts {
                 with_source_maps: false,
                 with_error_map: true,
                 named_addresses,
+                override_std,
                 skip_fetch_latest_git_deps,
                 bytecode_version,
                 compiler_version,
@@ -801,6 +811,7 @@ impl IncludedArtifacts {
                 with_source_maps: true,
                 with_error_map: true,
                 named_addresses,
+                override_std,
                 skip_fetch_latest_git_deps,
                 bytecode_version,
                 compiler_version,
@@ -923,6 +934,7 @@ impl CliCommand<TransactionSummary> for CreateObjectAndPublishPackage {
                 self.move_options.dev,
                 self.move_options.skip_fetch_latest_git_deps,
                 self.move_options.named_addresses(),
+                self.move_options.override_std.clone(),
                 self.move_options.bytecode_version,
                 self.move_options.compiler_version,
                 self.move_options.language_version,
@@ -1000,6 +1012,7 @@ impl CliCommand<TransactionSummary> for UpgradeObjectPackage {
                 self.move_options.dev,
                 self.move_options.skip_fetch_latest_git_deps,
                 self.move_options.named_addresses(),
+                self.move_options.override_std.clone(),
                 self.move_options.bytecode_version,
                 self.move_options.compiler_version,
                 self.move_options.language_version,
@@ -1125,6 +1138,7 @@ impl CliCommand<TransactionSummary> for CreateResourceAccountAndPublishPackage {
             move_options.dev,
             move_options.skip_fetch_latest_git_deps,
             move_options.named_addresses(),
+            move_options.override_std,
             move_options.bytecode_version,
             move_options.compiler_version,
             move_options.language_version,
@@ -1277,6 +1291,7 @@ impl CliCommand<&'static str> for VerifyPackage {
                 self.move_options.dev,
                 self.move_options.skip_fetch_latest_git_deps,
                 self.move_options.named_addresses(),
+                self.move_options.override_std.clone(),
                 self.move_options.bytecode_version,
                 self.move_options.compiler_version,
                 self.move_options.language_version,
diff --git a/crates/aptos/src/move_tool/show.rs b/crates/aptos/src/move_tool/show.rs
index bb763334dab60..1a910b322d70f 100644
--- a/crates/aptos/src/move_tool/show.rs
+++ b/crates/aptos/src/move_tool/show.rs
@@ -63,6 +63,7 @@ impl CliCommand<Vec<EntryABI>> for ShowAbi {
                     self.move_options.dev,
                     self.move_options.skip_fetch_latest_git_deps,
                     self.move_options.named_addresses(),
+                    self.move_options.override_std.clone(),
                     self.move_options.bytecode_version,
                     self.move_options.compiler_version,
                     self.move_options.language_version,
diff --git a/crates/aptos/src/test/mod.rs b/crates/aptos/src/test/mod.rs
index b85f55ff7d8d0..e1ac8e8adea69 100644
--- a/crates/aptos/src/test/mod.rs
+++ b/crates/aptos/src/test/mod.rs
@@ -1090,6 +1090,7 @@ impl CliTestFramework {
             package_dir: Some(self.move_dir()),
             output_dir: None,
             named_addresses: Self::named_addresses(account_strs),
+            override_std: None,
             skip_fetch_latest_git_deps: true,
             bytecode_version: None,
             compiler_version: None,
diff --git a/third_party/move/tools/move-package/src/lib.rs b/third_party/move/tools/move-package/src/lib.rs
index 89ded94d5a966..263123c15c8ee 100644
--- a/third_party/move/tools/move-package/src/lib.rs
+++ b/third_party/move/tools/move-package/src/lib.rs
@@ -28,7 +28,7 @@ use move_model::{
     model,
 };
 use serde::{Deserialize, Serialize};
-use source_package::layout::SourcePackageLayout;
+use source_package::{layout::SourcePackageLayout, std_lib::StdVersion};
 use std::{
     collections::{BTreeMap, BTreeSet},
     fmt,
@@ -109,6 +109,10 @@ pub struct BuildConfig {
     #[clap(name = "test-mode", long = "test", global = true)]
     pub test_mode: bool,
 
+    /// Whether to override the standard library with the given version.
+    #[clap(long = "override-std", global = true, value_parser)]
+    pub override_std: Option<StdVersion>,
+
     /// Generate documentation for packages
     #[clap(name = "generate-docs", long = "doc", global = true)]
     pub generate_docs: bool,
diff --git a/third_party/move/tools/move-package/src/resolution/resolution_graph.rs b/third_party/move/tools/move-package/src/resolution/resolution_graph.rs
index 49b763e4e3895..45223e632edd6 100644
--- a/third_party/move/tools/move-package/src/resolution/resolution_graph.rs
+++ b/third_party/move/tools/move-package/src/resolution/resolution_graph.rs
@@ -12,6 +12,7 @@ use crate::{
             Dependencies, Dependency, FileName, NamedAddress, PackageDigest, PackageName,
             SourceManifest, SubstOrRename,
         },
+        std_lib::{StdLib, StdVersion},
     },
     BuildConfig,
 };
@@ -107,14 +108,22 @@ impl ResolvingGraph {
         }
         let mut resolution_graph = Self {
             root_package_path: root_package_path.clone(),
-            build_options,
+            build_options: build_options.clone(),
             root_package: root_package.clone(),
             graph: DiGraphMap::new(),
             package_table: BTreeMap::new(),
         };
 
+        let override_std = &build_options.override_std;
+
         resolution_graph
-            .build_resolution_graph(root_package.clone(), root_package_path, true, writer)
+            .build_resolution_graph(
+                root_package.clone(),
+                root_package_path,
+                true,
+                override_std,
+                writer,
+            )
             .with_context(|| {
                 format!(
                     "Unable to resolve packages for package '{}'",
@@ -199,6 +208,7 @@ impl ResolvingGraph {
         package: SourceManifest,
         package_path: PathBuf,
         is_root_package: bool,
+        override_std: &Option<StdVersion>,
         writer: &mut W,
     ) -> Result<()> {
         let package_name = package.package.name;
@@ -237,12 +247,17 @@ impl ResolvingGraph {
             BTreeMap::new()
         };
 
-        for (dep_name, dep) in package
+        for (dep_name, mut dep) in package
             .dependencies
             .clone()
             .into_iter()
             .chain(additional_deps.into_iter())
         {
+            if let Some(std_version) = &override_std {
+                if let Some(std_lib) = StdLib::from_package_name(dep_name) {
+                    dep = std_lib.dependency(std_version);
+                }
+            }
             let dep_node_id = self.get_or_add_node(dep_name).with_context(|| {
                 format!(
                     "Cycle between packages {} and {} found",
@@ -252,7 +267,7 @@ impl ResolvingGraph {
             self.graph.add_edge(package_node_id, dep_node_id, ());
 
             let (dep_renaming, dep_resolution_table) = self
-                .process_dependency(dep_name, dep, package_path.clone(), writer)
+                .process_dependency(dep_name, dep, package_path.clone(), override_std, writer)
                 .with_context(|| {
                     format!(
                         "While resolving dependency '{}' in package '{}'",
@@ -393,6 +408,7 @@ impl ResolvingGraph {
         dep_name_in_pkg: PackageName,
         dep: Dependency,
         root_path: PathBuf,
+        override_std: &Option<StdVersion>,
         writer: &mut W,
     ) -> Result<(Renaming, ResolvingTable)> {
         Self::download_and_update_if_remote(
@@ -404,10 +420,14 @@ impl ResolvingGraph {
         let (dep_package, dep_package_dir) =
             Self::parse_package_manifest(&dep, &dep_name_in_pkg, root_path)
                 .with_context(|| format!("While processing dependency '{}'", dep_name_in_pkg))?;
-        self.build_resolution_graph(dep_package.clone(), dep_package_dir, false, writer)
-            .with_context(|| {
-                format!("Unable to resolve package dependency '{}'", dep_name_in_pkg)
-            })?;
+        self.build_resolution_graph(
+            dep_package.clone(),
+            dep_package_dir,
+            false,
+            override_std,
+            writer,
+        )
+        .with_context(|| format!("Unable to resolve package dependency '{}'", dep_name_in_pkg))?;
 
         if dep_name_in_pkg != dep_package.package.name {
             bail!("Name of dependency declared in package '{}' does not match dependency's package name '{}'",
diff --git a/third_party/move/tools/move-package/src/source_package/manifest_parser.rs b/third_party/move/tools/move-package/src/source_package/manifest_parser.rs
index 9a6bb2322c8d7..384724e666944 100644
--- a/third_party/move/tools/move-package/src/source_package/manifest_parser.rs
+++ b/third_party/move/tools/move-package/src/source_package/manifest_parser.rs
@@ -355,7 +355,6 @@ fn parse_dependency(dep_name: &str, tval: TV) -> Result<PM::Dependency> {
                     })
                 },
                 (None, Some(git), None) => {
-                    let move_home = MOVE_HOME.clone();
                     let rev_name = match table.remove("rev") {
                         None => bail!("Git revision not supplied for dependency"),
                         Some(r) => Symbol::from(
@@ -367,11 +366,7 @@ fn parse_dependency(dep_name: &str, tval: TV) -> Result<PM::Dependency> {
                     let git_url = git
                         .as_str()
                         .ok_or_else(|| anyhow::anyhow!("Git URL not a string"))?;
-                    let local_path = PathBuf::from(move_home).join(format!(
-                        "{}_{}",
-                        url_to_file_name(git_url),
-                        rev_name.replace('/', "__")
-                    ));
+                    let local_path = git_repo_cache_path(git_url, rev_name.as_str());
                     let subdir = PathBuf::from(match table.remove("subdir") {
                         None => "".to_string(),
                         Some(path) => path
@@ -571,3 +566,13 @@ fn check_for_required_field_names(
 
     Ok(())
 }
+
+/// Gets the local path to download the package from a git repo
+pub fn git_repo_cache_path(git_url: &str, rev_name: &str) -> PathBuf {
+    let move_home = MOVE_HOME.clone();
+    PathBuf::from(move_home).join(format!(
+        "{}_{}",
+        url_to_file_name(git_url),
+        rev_name.replace('/', "__")
+    ))
+}
diff --git a/third_party/move/tools/move-package/src/source_package/mod.rs b/third_party/move/tools/move-package/src/source_package/mod.rs
index a3829eaea18c1..c3819ef1938f4 100644
--- a/third_party/move/tools/move-package/src/source_package/mod.rs
+++ b/third_party/move/tools/move-package/src/source_package/mod.rs
@@ -5,3 +5,4 @@
 pub mod layout;
 pub mod manifest_parser;
 pub mod parsed_manifest;
+pub mod std_lib;
diff --git a/third_party/move/tools/move-package/src/source_package/std_lib.rs b/third_party/move/tools/move-package/src/source_package/std_lib.rs
new file mode 100644
index 0000000000000..4dfd8c6f6f8a0
--- /dev/null
+++ b/third_party/move/tools/move-package/src/source_package/std_lib.rs
@@ -0,0 +1,109 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    manifest_parser::git_repo_cache_path,
+    source_package::parsed_manifest::{Dependency, GitInfo},
+};
+use clap::ValueEnum;
+use move_symbol_pool::symbol::Symbol;
+use serde::{Deserialize, Serialize};
+use std::{fmt::Display, path::PathBuf};
+
+/// Represents a standard library.
+pub enum StdLib {
+    AptosFramework,
+    AptosStdlib,
+    MoveStdlib,
+}
+
+impl StdLib {
+    /// The well-known git URL for the standard library.
+    const STD_GIT_URL: &'static str = "https://github.com/aptos-labs/aptos-core.git";
+
+    /// Returns the dependency for the standard library with the given version.
+    pub fn dependency(&self, version: &StdVersion) -> Dependency {
+        let local = git_repo_cache_path(Self::STD_GIT_URL, version.rev());
+        Dependency {
+            local: local.join(self.sub_dir()),
+            subst: None,
+            version: None,
+            digest: None,
+            git_info: Some(GitInfo {
+                git_url: Symbol::from(StdLib::STD_GIT_URL),
+                git_rev: Symbol::from(version.rev()),
+                subdir: PathBuf::from(self.sub_dir()),
+                download_to: local,
+            }),
+            node_info: None,
+        }
+    }
+
+    /// Returns the name of the standard library.
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            StdLib::AptosFramework => "AptosFramework",
+            StdLib::AptosStdlib => "AptosStdlib",
+            StdLib::MoveStdlib => "MoveStdlib",
+        }
+    }
+
+    /// Returns the standard library from the given package name, or `None` if the package name is not a standard library.
+    pub fn from_package_name(package_name: Symbol) -> Option<StdLib> {
+        match package_name.as_str() {
+            "AptosFramework" => Some(StdLib::AptosFramework),
+            "AptosStdlib" => Some(StdLib::AptosStdlib),
+            "MoveStdlib" => Some(StdLib::MoveStdlib),
+            _ => None,
+        }
+    }
+
+    /// Returns the subdirectory of the standard library in the git repository.
+    fn sub_dir(&self) -> &'static str {
+        match self {
+            StdLib::AptosFramework => "aptos-move/framework/aptos-framework",
+            StdLib::AptosStdlib => "aptos-move/framework/aptos-stdlib",
+            StdLib::MoveStdlib => "aptos-move/framework/move-stdlib",
+        }
+    }
+}
+
+/// Represents a standard library version.
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, ValueEnum)]
+#[clap(rename_all = "lower")]
+pub enum StdVersion {
+    Mainnet,
+    Testnet,
+    Devnet,
+}
+
+impl StdVersion {
+    const DEVNET: &'static str = "devnet";
+    const MAINNET: &'static str = "mainnet";
+    const TESTNET: &'static str = "testnet";
+
+    /// Returns the rev name of the standard library version.
+    pub fn rev(&self) -> &'static str {
+        match self {
+            StdVersion::Mainnet => StdVersion::MAINNET,
+            StdVersion::Testnet => StdVersion::TESTNET,
+            StdVersion::Devnet => StdVersion::DEVNET,
+        }
+    }
+
+    /// Returns the standard library version from the given rev name, or `None` if the string is not a standard library version.
+    pub fn from_rev(version: &str) -> Option<StdVersion> {
+        match version {
+            StdVersion::MAINNET => Some(Self::Mainnet),
+            StdVersion::TESTNET => Some(Self::Testnet),
+            StdVersion::DEVNET => Some(Self::Devnet),
+            _ => None,
+        }
+    }
+}
+
+impl Display for StdVersion {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.rev())
+    }
+}
diff --git a/third_party/move/tools/move-package/tests/test_runner.rs b/third_party/move/tools/move-package/tests/test_runner.rs
index 486959f756b71..43f831e63838d 100644
--- a/third_party/move/tools/move-package/tests/test_runner.rs
+++ b/third_party/move/tools/move-package/tests/test_runner.rs
@@ -10,12 +10,12 @@ use move_compiler::shared::known_attributes::KnownAttribute;
 use move_model::metadata::{CompilerVersion, LanguageVersion};
 use move_package::{
     compilation::{build_plan::BuildPlan, model_builder::ModelBuilder},
-    package_hooks,
-    package_hooks::PackageHooks,
+    package_hooks::{self, PackageHooks},
     resolution::resolution_graph as RG,
     source_package::{
         manifest_parser as MP,
         parsed_manifest::{CustomDepInfo, PackageDigest},
+        std_lib::StdVersion,
     },
     BuildConfig, CompilerConfig, ModelConfig,
 };
@@ -29,6 +29,7 @@ use tempfile::tempdir;
 
 const COMPILE_EXT: &str = "compile";
 const MODEL_EXT: &str = "model";
+const OVERRIDE_EXT: &str = "override";
 
 fn run_test_impl(
     path: &Path,
@@ -39,6 +40,15 @@ fn run_test_impl(
         ..Default::default()
     };
     compiler_config.compiler_version = Some(compiler_version);
+    let override_path = path.with_extension(OVERRIDE_EXT);
+    let override_std = if override_path.is_file() {
+        Some(
+            StdVersion::from_rev(&fs::read_to_string(override_path)?)
+                .expect("one of mainnet/testnet/devnet"),
+        )
+    } else {
+        None
+    };
     let should_compile = path.with_extension(COMPILE_EXT).is_file();
     let should_model = path.with_extension(MODEL_EXT).is_file();
     let contents = fs::read_to_string(path)?;
@@ -51,6 +61,7 @@ fn run_test_impl(
                 BuildConfig {
                     dev_mode: true,
                     test_mode: false,
+                    override_std,
                     generate_docs: false,
                     generate_abis: false,
                     install_dir: Some(tempdir().unwrap().path().to_path_buf()),
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp
index c7db84b07c642..501dd2071410f 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp
@@ -7,6 +7,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp
index 7719a13c2b504..a25228bfd0cb3 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
index de543cb5e5995..1b4846e5d0b19 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp
index ead9bb2d6164d..3c3d15e1b41d6 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp
index 14caf20ea4a78..52bc9bddb60b9 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp
@@ -10,6 +10,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp
index 14caf20ea4a78..52bc9bddb60b9 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp
@@ -10,6 +10,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp
index 08b31aacb2e40..ba5ef893226d3 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp
@@ -11,6 +11,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp
index 4951314aa0ea8..171021215b190 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp
@@ -11,6 +11,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp
index 6197567116d6a..992a1e15a01fb 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp
index b739c18644d23..53324c0029187 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp
index 6197567116d6a..992a1e15a01fb 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp
index 6197567116d6a..992a1e15a01fb 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.compile b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.compile
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.exp
new file mode 100644
index 0000000000000..d3c93b3810376
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'std-lib-conflicts': While resolving dependency 'B' in package 'std-lib-conflicts': Unable to resolve package dependency 'B': While resolving dependency 'AptosFramework' in package 'B': Unable to resolve package dependency 'AptosFramework': Conflicting dependencies found: package 'AptosFramework' conflicts with 'AptosFramework'
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.toml b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.toml
new file mode 100644
index 0000000000000..b6220b8e4c7b0
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/Move.toml
@@ -0,0 +1,19 @@
+[package]
+name = "std-lib-conflicts"
+version = "1.0.0"
+authors = []
+
+[addresses]
+A = "0x42"
+
+[dev-addresses]
+
+[dependencies.AptosFramework]
+git = "https://github.com/aptos-labs/aptos-core.git"
+rev = "devnet"
+subdir = "aptos-move/framework/aptos-framework"
+
+[dependencies.B]
+local = "./deps_only"
+
+[dev-dependencies]
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/deps_only/Move.toml b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/deps_only/Move.toml
new file mode 100644
index 0000000000000..c056666dea12d
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/deps_only/Move.toml
@@ -0,0 +1,16 @@
+[package]
+name = "B"
+version = "1.0.0"
+authors = []
+
+[addresses]
+B = "0x43"
+
+[dev-addresses]
+
+[dependencies.AptosFramework]
+git = "https://github.com/aptos-labs/aptos-core.git"
+rev = "mainnet"
+subdir = "aptos-move/framework/aptos-framework"
+
+[dev-dependencies]
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/deps_only/sources/B.move b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/deps_only/sources/B.move
new file mode 100644
index 0000000000000..6167a02cb4ac2
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/deps_only/sources/B.move
@@ -0,0 +1,3 @@
+module B::B {
+	public fun foo() {}
+}
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/sources/A.move b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/sources/A.move
new file mode 100644
index 0000000000000..52551bda99f85
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-conflicts/sources/A.move
@@ -0,0 +1,6 @@
+module A::A {
+	use B::B;
+	public fun foo() {
+		B::foo();
+	}
+}
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.compile b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.compile
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.exp
new file mode 100644
index 0000000000000..162057ccc613f
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.exp
@@ -0,0 +1,55 @@
+CompiledPackageInfo {
+    package_name: "std-lib-conflicts",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000042,
+        "B": 0000000000000000000000000000000000000000000000000000000000000043,
+        "Extensions": 0000000000000000000000000000000000000000000000000000000000000001,
+        "aptos_framework": 0000000000000000000000000000000000000000000000000000000000000001,
+        "aptos_fungible_asset": 000000000000000000000000000000000000000000000000000000000000000a,
+        "aptos_std": 0000000000000000000000000000000000000000000000000000000000000001,
+        "aptos_token": 0000000000000000000000000000000000000000000000000000000000000003,
+        "core_resources": 000000000000000000000000000000000000000000000000000000000a550c18,
+        "std": 0000000000000000000000000000000000000000000000000000000000000001,
+        "vm": 0000000000000000000000000000000000000000000000000000000000000000,
+        "vm_reserved": 0000000000000000000000000000000000000000000000000000000000000000,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        override_std: Some(
+            Devnet,
+        ),
+        generate_docs: false,
+        generate_abis: false,
+        generate_move_model: false,
+        full_model_generation: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        compiler_config: CompilerConfig {
+            bytecode_version: None,
+            known_attributes: {
+                "bytecode_instruction",
+                "deprecated",
+                "expected_failure",
+                "native_interface",
+                "test",
+                "test_only",
+                "verify_only",
+            },
+            skip_attribute_checks: false,
+            compiler_version: Some(
+                V1,
+            ),
+            language_version: None,
+        },
+    },
+}
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.override b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.override
new file mode 100644
index 0000000000000..ff693d99966be
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.override
@@ -0,0 +1 @@
+devnet
\ No newline at end of file
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.toml b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.toml
new file mode 100644
index 0000000000000..b6220b8e4c7b0
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.toml
@@ -0,0 +1,19 @@
+[package]
+name = "std-lib-conflicts"
+version = "1.0.0"
+authors = []
+
+[addresses]
+A = "0x42"
+
+[dev-addresses]
+
+[dependencies.AptosFramework]
+git = "https://github.com/aptos-labs/aptos-core.git"
+rev = "devnet"
+subdir = "aptos-move/framework/aptos-framework"
+
+[dependencies.B]
+local = "./deps_only"
+
+[dev-dependencies]
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/Move.toml b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/Move.toml
new file mode 100644
index 0000000000000..c056666dea12d
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/Move.toml
@@ -0,0 +1,16 @@
+[package]
+name = "B"
+version = "1.0.0"
+authors = []
+
+[addresses]
+B = "0x43"
+
+[dev-addresses]
+
+[dependencies.AptosFramework]
+git = "https://github.com/aptos-labs/aptos-core.git"
+rev = "mainnet"
+subdir = "aptos-move/framework/aptos-framework"
+
+[dev-dependencies]
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/sources/B.move b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/sources/B.move
new file mode 100644
index 0000000000000..6167a02cb4ac2
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/deps_only/sources/B.move
@@ -0,0 +1,3 @@
+module B::B {
+	public fun foo() {}
+}
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/sources/A.move b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/sources/A.move
new file mode 100644
index 0000000000000..52551bda99f85
--- /dev/null
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/sources/A.move
@@ -0,0 +1,6 @@
+module A::A {
+	use B::B;
+	public fun foo() {
+		B::foo();
+	}
+}
diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp b/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp
index 7719a13c2b504..a25228bfd0cb3 100644
--- a/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp
@@ -9,6 +9,7 @@ CompiledPackageInfo {
     build_flags: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp b/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp
index 7e24cce41b587..c87bbd940d46a 100644
--- a/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp b/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp
index d9a9a2eb11344..2694e4a88dc36 100644
--- a/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp
index c7a32db370932..f9a75f042a00c 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp
index f2173a630b7ae..aa4691c3f5ff8 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
index 8323aebec23be..1c0fcac0cd040 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp
index 14d3339915f56..f2ee2ddcbbc2a 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp
index daeee0be6a2b4..1c044fe40dbda 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp
index 7a12b7249fe8e..f384d6feadde8 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp
index 930b16d46aef9..fdf01a960606a 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp
index d27f5a7a508ae..41e627061a229 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp
index 3d7ded2cd6d62..49f4cfe1df163 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp
index 75a513d49cea0..cf16366be8c25 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp
index a35b649a97837..eebb6dbbcfe76 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,
diff --git a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp
index 29f0a821f714c..879427f081802 100644
--- a/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp
+++ b/third_party/move/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp
@@ -3,6 +3,7 @@ ResolutionGraph {
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
+        override_std: None,
         generate_docs: false,
         generate_abis: false,
         generate_move_model: false,