diff --git a/etc/jenkins/systemPropertiesFile b/core-server/etc/systemPropertiesFile
similarity index 100%
rename from etc/jenkins/systemPropertiesFile
rename to core-server/etc/systemPropertiesFile
diff --git a/core-server/pom.xml b/core-server/pom.xml
index 54c84ffba0..633e841944 100644
--- a/core-server/pom.xml
+++ b/core-server/pom.xml
@@ -156,6 +156,7 @@
1
1C
true
+ ${project.basedir}/etc/systemPropertiesFile
diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/monitoring/TimeWindowStatisticsImplTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/monitoring/TimeWindowStatisticsImplTest.java
index d92393e347..d8f9a8cf6c 100644
--- a/core-server/src/test/java/org/glassfish/jersey/server/internal/monitoring/TimeWindowStatisticsImplTest.java
+++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/monitoring/TimeWindowStatisticsImplTest.java
@@ -37,12 +37,6 @@ public class TimeWindowStatisticsImplTest {
private static final int COLLISION_BUFFER_POWER = 3;
private static final double DELTA = 0.0001;
- @BeforeClass
- public static void beforeClass() {
- System.setProperty(ServerProperties.COLLISION_BUFFER_POWER_JVM_ARG,
- Integer.toString(COLLISION_BUFFER_POWER));
- }
-
@Test
public void jvmLoaded() {
assertEquals(COLLISION_BUFFER_POWER, ReservoirConstants.COLLISION_BUFFER_POWER);
diff --git a/etc/jenkins/jenkins_build.sh b/etc/jenkins/jenkins_build.sh
index afa8b1584e..e612cbbc3f 100644
--- a/etc/jenkins/jenkins_build.sh
+++ b/etc/jenkins/jenkins_build.sh
@@ -2,4 +2,4 @@
export DEBUG=true
-mvn -V -U -B -e clean install glassfish-copyright:check -Dcopyright.quiet=false -Dsurefire.systemPropertiesFile=${WORKSPACE}/etc/jenkins/systemPropertiesFile
\ No newline at end of file
+mvn -V -U -B -e clean install glassfish-copyright:check -Dcopyright.quiet=false
\ No newline at end of file