diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml
index 36a13ca6a6..15c9079f52 100644
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@ -816,6 +816,7 @@ commands:
             git remote set-branches --add apache '$branch'
             git fetch --depth 1 apache $branch
             git checkout $branch
+            git clean -fd
             # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
             for x in $(seq 1 3); do
                 ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
@@ -832,7 +833,9 @@ commands:
             fi
           done
           # and build the dtest-jar for the branch under test
+          ${ANT_HOME}/bin/ant realclean
           git checkout origin/$CIRCLE_BRANCH
+          git clean -fd
           for x in $(seq 1 3); do
               ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
               RETURN="$?"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9f3765b1ca..56f9bd9731 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2358,6 +2358,7 @@ jobs:
             git remote set-branches --add apache '$branch'
             git fetch --depth 1 apache $branch
             git checkout $branch
+            git clean -fd
             # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
             for x in $(seq 1 3); do
                 ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
@@ -2374,7 +2375,9 @@ jobs:
             fi
           done
           # and build the dtest-jar for the branch under test
+          ${ANT_HOME}/bin/ant realclean
           git checkout origin/$CIRCLE_BRANCH
+          git clean -fd
           for x in $(seq 1 3); do
               ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
               RETURN="$?"
diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES
index fa2448c22f..27c67cb5c9 100644
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@ -2358,6 +2358,7 @@ jobs:
             git remote set-branches --add apache '$branch'
             git fetch --depth 1 apache $branch
             git checkout $branch
+            git clean -fd
             # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
             for x in $(seq 1 3); do
                 ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
@@ -2374,7 +2375,9 @@ jobs:
             fi
           done
           # and build the dtest-jar for the branch under test
+          ${ANT_HOME}/bin/ant realclean
           git checkout origin/$CIRCLE_BRANCH
+          git clean -fd
           for x in $(seq 1 3); do
               ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
               RETURN="$?"
diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES
index 9f3765b1ca..56f9bd9731 100644
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@ -2358,6 +2358,7 @@ jobs:
             git remote set-branches --add apache '$branch'
             git fetch --depth 1 apache $branch
             git checkout $branch
+            git clean -fd
             # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
             for x in $(seq 1 3); do
                 ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
@@ -2374,7 +2375,9 @@ jobs:
             fi
           done
           # and build the dtest-jar for the branch under test
+          ${ANT_HOME}/bin/ant realclean
           git checkout origin/$CIRCLE_BRANCH
+          git clean -fd
           for x in $(seq 1 3); do
               ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
               RETURN="$?"
diff --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES
index fc51b2b6c3..258bc3e26d 100644
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@ -2358,6 +2358,7 @@ jobs:
             git remote set-branches --add apache '$branch'
             git fetch --depth 1 apache $branch
             git checkout $branch
+            git clean -fd
             # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
             for x in $(seq 1 3); do
                 ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
@@ -2374,7 +2375,9 @@ jobs:
             fi
           done
           # and build the dtest-jar for the branch under test
+          ${ANT_HOME}/bin/ant realclean
           git checkout origin/$CIRCLE_BRANCH
+          git clean -fd
           for x in $(seq 1 3); do
               ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
               RETURN="$?"