diff --git a/smoketest/run-tests.sh b/smoketest/run-tests.sh
index e63b261efe..58158ade7f 100755
--- a/smoketest/run-tests.sh
+++ b/smoketest/run-tests.sh
@@ -5,19 +5,23 @@ set -xe
 cargo test --no-run
 
 tests=(
+  # ERC20 Tests
   register_token
-
   send_token
   send_token_to_penpal
   transfer_token
 
+  # PNA Tests
+  register_polkadot_token 
+  transfer_polkadot_token
+  send_polkadot_token
+
+  # System Pallet Tests
   set_pricing_params
   set_token_transfer_fees
-
   create_agent
   create_channel
   transfer_native_from_agent
-
   upgrade_gateway
 )
 
diff --git a/smoketest/tests/upgrade_gateway.rs b/smoketest/tests/upgrade_gateway.rs
index e896b2c29c..c6a4046c46 100644
--- a/smoketest/tests/upgrade_gateway.rs
+++ b/smoketest/tests/upgrade_gateway.rs
@@ -42,7 +42,7 @@ use subxt::{
 	OnlineClient, PolkadotConfig,
 };
 
-const GATEWAY_V2_ADDRESS: [u8; 20] = hex!("f8f7758fbcefd546eaeff7de24aff666b6228e73");
+const GATEWAY_V2_ADDRESS: [u8; 20] = hex!("ee9170abfbf9421ad6dd07f6bdec9d89f2b581e0");
 
 #[tokio::test]
 async fn upgrade_gateway() {