diff --git a/Makefile b/Makefile
index 3f13ad3..e9be4c8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,12 @@ prepare:
 	rustup target add wasm32-unknown-unknown
 	rustup component add clippy --toolchain ${PINNED_TOOLCHAIN}
 	rustup component add rustfmt --toolchain ${PINNED_TOOLCHAIN}
+	rustup component add rust-src --toolchain ${PINNED_TOOLCHAIN}
 
 .PHONY:	build-contract
 build-contract:
-	cargo build --release --target wasm32-unknown-unknown -p cep18
-	cargo build --release --target wasm32-unknown-unknown -p cep18-test-contract
+	RUSTFLAGS="-C target-cpu=mvp" cargo build --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort -p cep18
+	RUSTFLAGS="-C target-cpu=mvp" cargo build --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort -p cep18-test-contract
 	wasm-strip target/wasm32-unknown-unknown/release/cep18.wasm
 	wasm-strip target/wasm32-unknown-unknown/release/cep18_test_contract.wasm
 
diff --git a/rust-toolchain b/rust-toolchain
index f9e5e5e..579ba54 100755
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2023-03-25
+nightly-2024-05-28
diff --git a/tests/src/utility/installer_request_builders.rs b/tests/src/utility/installer_request_builders.rs
index a500a3a..5b3c3ab 100644
--- a/tests/src/utility/installer_request_builders.rs
+++ b/tests/src/utility/installer_request_builders.rs
@@ -154,8 +154,7 @@ pub(crate) fn get_test_result<T: FromBytes + CLTyped>(
     let enabled_versions = contract_package.enabled_versions();
     let (_version, contract_hash) = enabled_versions
         .iter()
-        .rev()
-        .next()
+        .next_back()
         .expect("should have latest version");
 
     builder.get_value(*contract_hash, RESULT_KEY)