diff --git a/motoko/classes/Makefile b/motoko/classes/Makefile
index 53fc16104..265243603 100644
--- a/motoko/classes/Makefile
+++ b/motoko/classes/Makefile
@@ -4,7 +4,7 @@ all: build
 .PHONY: build
 .SILENT: build
 build:
-	dfx canister create --all
+	dfx canister create --all --no-wallet
 	dfx build
 
 .PHONY: install
diff --git a/motoko/composite_query/Makefile b/motoko/composite_query/Makefile
index c1deb5608..cf61c4a22 100644
--- a/motoko/composite_query/Makefile
+++ b/motoko/composite_query/Makefile
@@ -4,7 +4,7 @@ all: build
 .PHONY: build
 .SILENT: build
 build:
-	dfx canister create --all
+	dfx canister create --all --no-wallet
 	dfx build
 
 .PHONY: install
diff --git a/motoko/hello_cycles/Makefile b/motoko/hello_cycles/Makefile
index f0d322454..a145d27f8 100644
--- a/motoko/hello_cycles/Makefile
+++ b/motoko/hello_cycles/Makefile
@@ -26,19 +26,19 @@ test: install
 	echo "wallet: $(WALLET)"
 	echo "hello_cycles: $(HELLO_CYCLES)"
 	echo "$(dfx canister call hello_cycles wallet_balance)"
-	# canister has just above 2.98T cycles, so output start with '(2_98'
+	# canister has just above 2.5T cycles, so output start with '(2_5'
 	dfx canister call hello_cycles wallet_balance \
-		| grep '(2_98' && echo 'PASS'
+		| grep '(2_5' && echo 'PASS'
 	dfx canister status hello_cycles
 	dfx canister call $(WALLET) wallet_send '(record { canister = principal "$(HELLO_CYCLES)"; amount = (2000000000000:nat64); } )'
-	# 2T cycles added, now contains just above 4.98T
+	# 2T cycles added, now contains just above 4.5T
 	dfx canister call hello_cycles wallet_balance \
-		| grep '(4_98' && echo 'PASS'
+		| grep '(4_5' && echo 'PASS'
 	echo  '(func "$(WALLET)"."wallet_receive", 5000000)'
 	dfx canister call hello_cycles transfer '(func "$(WALLET)"."wallet_receive", 5000000)' \
 		| grep '0' && echo 'PASS'
 	dfx canister call hello_cycles wallet_balance \
-	 	| grep '(4_98' && echo 'PASS'
+	 	| grep '(4_5' && echo 'PASS'
 
 .PHONY: clean
 .SILENT: clean