diff --git a/ballerina/tests/optional_subscriber_target_test.bal b/ballerina/tests/optional_subscriber_target_test.bal
index 931f0798..a61ba54e 100644
--- a/ballerina/tests/optional_subscriber_target_test.bal
+++ b/ballerina/tests/optional_subscriber_target_test.bal
@@ -17,7 +17,7 @@
 import ballerina/log;
 import ballerina/test;
 
-listener Listener optionalTargetListener = new (9094);
+listener Listener optionalTargetListener = new (SUB_WITH_OPT_TARGET_PORT);
 
 SubscriberService optionalSubscriberTarget = @SubscriberServiceConfig { leaseSeconds: 36000, secret: "Kslk30SNF2AChs2", unsubscribeOnShutdown: false } 
                               service object {
diff --git a/ballerina/tests/test_ports.bal b/ballerina/tests/test_ports.bal
index 07534c7e..a1acc3d0 100644
--- a/ballerina/tests/test_ports.bal
+++ b/ballerina/tests/test_ports.bal
@@ -20,3 +20,4 @@ const int BASE_PORT = 9400;
 const int BASIC_SUB_PORT = BASE_PORT + 1;
 const int SUB_WITH_DFLT_METHODS_PORT = BASE_PORT + 2;
 const int SUB_WITH_ADDITIONAL_ERRDETAILS_PORT = BASE_PORT + 3;
+const int SUB_WITH_OPT_TARGET_PORT = BASE_PORT + 4;