diff --git a/.circleci/config.yml b/.circleci/config.yml
index f18babe7..1a30b683 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,6 +24,8 @@ jobs:
               export LEGACYPIPE_TEST_DATA=$LPT
               export GAIA_CAT_DIR=$LPT/gaia-dr2
               export GAIA_CAT_VER=2
+              export GAIA_CAT_SCHEME=ring
+              export GAIA_CAT_PREFIX=chunk
               export PS1CAT_DIR=$LPT/ps1-qz-star-v3
               export TYCHO2_KD_DIR=$LPT
               python3.6 test/legacyzpts_test.py
@@ -48,6 +50,8 @@ jobs:
               export LEGACYPIPE_TEST_DATA=$LPT
               export GAIA_CAT_DIR=$LPT/gaia-dr2
               export GAIA_CAT_VER=2
+              export GAIA_CAT_SCHEME=ring
+              export GAIA_CAT_PREFIX=chunk
               export PS1CAT_DIR=$LPT/ps1-qz-star-v3
               export TYCHO2_KD_DIR=$LPT
               coverage run --concurrency=multiprocessing -a test/legacyzpts_test.py
@@ -83,6 +87,8 @@ jobs:
               export LEGACYPIPE_TEST_DATA=$LPT
               export GAIA_CAT_DIR=$LPT/gaia-dr2
               export GAIA_CAT_VER=2
+              export GAIA_CAT_SCHEME=ring
+              export GAIA_CAT_PREFIX=chunk
               export PS1CAT_DIR=$LPT/ps1-qz-star-v3
               export TYCHO2_KD_DIR=$LPT
               python3.8 test/legacyzpts_test.py
@@ -111,6 +117,8 @@ jobs:
               export LEGACYPIPE_TEST_DATA=$LPT
               export GAIA_CAT_DIR=$LPT/gaia-dr2
               export GAIA_CAT_VER=2
+              export GAIA_CAT_SCHEME=ring
+              export GAIA_CAT_PREFIX=chunk
               export PS1CAT_DIR=$LPT/ps1-qz-star-v3
               export TYCHO2_KD_DIR=$LPT
               python3.8 test/legacyzpts_test.py
@@ -139,6 +147,8 @@ jobs:
               export LEGACYPIPE_TEST_DATA=$LPT
               export GAIA_CAT_DIR=$LPT/gaia-dr2
               export GAIA_CAT_VER=2
+              export GAIA_CAT_SCHEME=ring
+              export GAIA_CAT_PREFIX=chunk
               export PS1CAT_DIR=$LPT/ps1-qz-star-v3
               export TYCHO2_KD_DIR=$LPT
               python3.9 test/legacyzpts_test.py
@@ -167,6 +177,8 @@ jobs:
               export LEGACYPIPE_TEST_DATA=$LPT
               export GAIA_CAT_DIR=$LPT/gaia-dr2
               export GAIA_CAT_VER=2
+              export GAIA_CAT_SCHEME=ring
+              export GAIA_CAT_PREFIX=chunk
               export PS1CAT_DIR=$LPT/ps1-qz-star-v3
               export TYCHO2_KD_DIR=$LPT
               python3.10 test/legacyzpts_test.py
@@ -195,6 +207,8 @@ jobs:
               export LEGACYPIPE_TEST_DATA=$LPT
               export GAIA_CAT_DIR=$LPT/gaia-dr2
               export GAIA_CAT_VER=2
+              export GAIA_CAT_SCHEME=ring
+              export GAIA_CAT_PREFIX=chunk
               export PS1CAT_DIR=$LPT/ps1-qz-star-v3
               export TYCHO2_KD_DIR=$LPT
               python3.11 test/legacyzpts_test.py
diff --git a/py/test/runbrick_test.py b/py/test/runbrick_test.py
index 78e68ee8..67a4c3a4 100644
--- a/py/test/runbrick_test.py
+++ b/py/test/runbrick_test.py
@@ -165,6 +165,8 @@ def rbmain():
     os.environ['TYCHO2_KD_DIR'] = surveydir
     os.environ['GAIA_CAT_DIR'] = os.path.join(surveydir, 'gaia')
     os.environ['GAIA_CAT_VER'] = '2'
+    os.environ['GAIA_CAT_PREFIX'] = 'chunk'
+    os.environ['GAIA_CAT_SCHEME'] = 'ring'
     os.environ['UNWISE_MODEL_SKY_DIR'] = os.path.join(surveydir, 'images', 'unwise-mod')
     #python legacypipe/runbrick.py --radec  --width 100 --height 100 --outdir dup5b --survey-dir test/testcase12 --force-all --no-wise
     unwdir = os.path.join(surveydir, 'images', 'unwise')