diff --git a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/BooleanTermsIT.java b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/BooleanTermsIT.java
index 448b0608c4c81..85bdca8a3e980 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/BooleanTermsIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/BooleanTermsIT.java
@@ -50,7 +50,7 @@ public class BooleanTermsIT extends OpenSearchIntegTestCase {
     private static final String SINGLE_VALUED_FIELD_NAME = "b_value";
     private static final String MULTI_VALUED_FIELD_NAME = "b_values";
 
-    static int numSingleTrues, numSingleFalses, numMultiTrues, numMultiFalses;
+    int numSingleTrues, numSingleFalses, numMultiTrues, numMultiFalses;
 
     @Before
     public void setupTest() throws Exception {
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/DerivativeIT.java b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/DerivativeIT.java
index 158dfee527f02..1b0706b5834a3 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/DerivativeIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/DerivativeIT.java
@@ -75,23 +75,23 @@ public class DerivativeIT extends OpenSearchIntegTestCase {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "l_value";
 
-    private static int interval;
-    private static int numValueBuckets;
-    private static int numFirstDerivValueBuckets;
-    private static int numSecondDerivValueBuckets;
-    private static long[] valueCounts;
-    private static long[] firstDerivValueCounts;
-    private static long[] secondDerivValueCounts;
-
-    private static Long[] valueCounts_empty;
-    private static long numDocsEmptyIdx;
-    private static Double[] firstDerivValueCounts_empty;
+    private  int interval;
+    private  int numValueBuckets;
+    private  int numFirstDerivValueBuckets;
+    private  int numSecondDerivValueBuckets;
+    private  long[] valueCounts;
+    private  long[] firstDerivValueCounts;
+    private  long[] secondDerivValueCounts;
+
+    private  Long[] valueCounts_empty;
+    private  long numDocsEmptyIdx;
+    private  Double[] firstDerivValueCounts_empty;
 
     // expected bucket values for random setup with gaps
-    private static int numBuckets_empty_rnd;
-    private static Long[] valueCounts_empty_rnd;
-    private static Double[] firstDerivValueCounts_empty_rnd;
-    private static long numDocsEmptyIdx_rnd;
+    private  int numBuckets_empty_rnd;
+    private  Long[] valueCounts_empty_rnd;
+    private  Double[] firstDerivValueCounts_empty_rnd;
+    private  long numDocsEmptyIdx_rnd;
 
     @Before
     public void setupTest() throws Exception {
@@ -484,7 +484,6 @@ public void testDocCountDerivativeWithGaps_insertZeros() throws Exception {
         assertThat(deriv.getName(), equalTo("histo"));
         List<? extends Bucket> buckets = deriv.getBuckets();
         assertThat(buckets.size(), equalTo(valueCounts_empty.length));
-
         for (int i = 0; i < valueCounts_empty.length; i++) {
             Histogram.Bucket bucket = buckets.get(i);
             checkBucketKeyAndDocCount("InternalBucket " + i + ": ", bucket, i, valueCounts_empty[i]);