diff --git a/.azure_pipelines/ci-pipeline-makefile-nightly.yml b/.azure_pipelines/ci-pipeline-makefile-nightly.yml
index f22e2b5d9..1ff2c44dc 100644
--- a/.azure_pipelines/ci-pipeline-makefile-nightly.yml
+++ b/.azure_pipelines/ci-pipeline-makefile-nightly.yml
@@ -95,8 +95,8 @@ jobs:
         scriptPath: $(SCRIPTS_ROOT)/run-azure-tests.sh
         addSpnToEnvironment: true
         arguments:
-          $(Build.SourcesDirectory)/solutions/dotnet_azure_sdk
           $(Build.SourcesDirectory)/tests/azure-sdk-for-cpp
+          $(Build.SourcesDirectory)/solutions/dotnet_azure_sdk
       env:
         AZURE_KEYVAULT_URL: $(AZURE_TEST_KEYVAULT_URL)
         STANDARD_STORAGE_CONNECTION_STRING: $(STANDARD_STORAGE_CONNECTION_STRING)
diff --git a/solutions/dotnet/Makefile b/solutions/dotnet/Makefile
index bd94649ef..1d63829f6 100644
--- a/solutions/dotnet/Makefile
+++ b/solutions/dotnet/Makefile
@@ -15,7 +15,7 @@ run-unsigned:
 	$(MYST_EXEC) $(OPTS) --memory-size=1024m rootfs /app/HelloWorld
 
 run: appdir private.pem
-	$(MYST) package appdir private.pem config.json
+	timeout 45m $(MYST) package appdir private.pem config.json
 	myst/bin/$(APPNAME) $(OPTS)
 	
 gdb: appdir private.pem
diff --git a/tests/libcxx2/Makefile b/tests/libcxx2/Makefile
index 570819e62..ce012a025 100644
--- a/tests/libcxx2/Makefile
+++ b/tests/libcxx2/Makefile
@@ -50,7 +50,7 @@ $(ROOTFS): run.c
 	$(MYST) mkext2 $(APPDIR) $(ROOTFS)
 	# run with posix spawn
 
-OPTS += --memory-size=1024m
+OPTS += --memory-size=1536m
 
 tests:
 	$(RUNTEST) $(MAKE) __tests
diff --git a/tests/sockperf/Makefile b/tests/sockperf/Makefile
index 08a654c37..e5a39a620 100644
--- a/tests/sockperf/Makefile
+++ b/tests/sockperf/Makefile
@@ -28,13 +28,13 @@ tests:
 	docker run --network="host" temp-image-for-server /app/sockperf server &
 	./wait.sh
 	$(RUNTEST) $(MYST_EXEC) $(OPTS) $(ROOTFS) /app/sockperf ping-pong
-	$(RUNTEST) $(MYST_EXEC) $(OPTS) $(ROOTFS) /app/sockperf under-load
+	# $(RUNTEST) $(MYST_EXEC) $(OPTS) $(ROOTFS) /app/sockperf under-load
 	$(RUNTEST) $(MYST_EXEC) $(OPTS) $(ROOTFS) /app/sockperf throughput --msg-size=1472
 	./kill.sh
 	docker run --network="host" temp-image-for-server /app/sockperf server --tcp &
 	./wait.sh
 	$(RUNTEST) $(MYST_EXEC) $(OPTS) $(ROOTFS) /app/sockperf ping-pong --tcp
-	$(RUNTEST) $(MYST_EXEC) $(OPTS) $(ROOTFS) /app/sockperf under-load --tcp
+	# $(RUNTEST) $(MYST_EXEC) $(OPTS) $(ROOTFS) /app/sockperf under-load --tcp
 	$(RUNTEST) $(MYST_EXEC) $(OPTS) $(ROOTFS) /app/sockperf throughput --msg-size=1472 --tcp
 	./kill.sh