diff --git a/gradle.properties b/gradle.properties
index a10fd403..cdc87dcc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,8 +8,11 @@ systemProp.tests.rest.cluster=localhost:9200
 # The Elasticsearch cluster node communication endpoint
 systemProp.tests.cluster=localhost:9300
 
-# Comment this in if you want a cluster spun up for integration testing
+# Set this to true if you want a cluster spun up for integration testing
 systemProp.tests.useDockerCluster=false
 
-# Comment this in to enable integration testing
+# Set this to true if you want to enable integration testing
 systemProp.tests.enableIT=false
+
+# The port number for the PerformanceAnalyzer WebService
+systemProp.tests.pa.port=9600
\ No newline at end of file
diff --git a/src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/PerformanceAnalyzerIT.java b/src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/PerformanceAnalyzerIT.java
index 834750d5..aac857ff 100644
--- a/src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/PerformanceAnalyzerIT.java
+++ b/src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/PerformanceAnalyzerIT.java
@@ -28,7 +28,7 @@
 
 public class PerformanceAnalyzerIT extends ESRestTestCase {
     private static final Logger LOG = LogManager.getLogger(PerformanceAnalyzerIT.class);
-    private static final int PORT = 9600;
+    private static final int PORT = Integer.parseInt(System.getProperty("tests.pa.port"));
     private static final ObjectMapper mapper = new ObjectMapper();
     private static RestClient paClient;