diff --git a/test/config/TCGenConfig_shape b/test/config/TCGenConfig_shape
index bc658c734f..767349741e 100644
--- a/test/config/TCGenConfig_shape
+++ b/test/config/TCGenConfig_shape
@@ -80,7 +80,14 @@ oper_technique = "CARQ";
 // Array of dictionaries containing the track filtering options
 // If empty, a single filter is defined using the top-level settings.
 //
-filter = [];
+filter = [
+   { desc = "SUMMER_INIT";  init_beg   = "20210601"; init_end = "20210901"; },
+   { desc = "00Z_12Z_INIT"; init_hour  = [ "00", "12" ];  },
+   { desc = "06Z_18Z_INIT"; init_hour  = [ "06", "18" ];  },
+   { desc = "AL_EP_BASIN";  basin_mask = ["AL", "EP" ];  },
+   { desc = "AL_BASIN";     basin_mask = "AL";  },
+   { desc = "EP_BASIN";     basin_mask = "EP";  }
+];
 
 //
 // Description written to output DESC column
diff --git a/test/xml/unit_tc_gen.xml b/test/xml/unit_tc_gen.xml
index a32b3a647c..6146f1d3ec 100644
--- a/test/xml/unit_tc_gen.xml
+++ b/test/xml/unit_tc_gen.xml
@@ -55,19 +55,20 @@
 
   <!-- Verify genesis shapes -->
 
-  <test name="tc_gen_shape">
+  <test name="tc_gen_2021_shape">
     <exec>&MET_BIN;/tc_gen</exec>
     <param> \
-      -shape &DATA_DIR;/genesis/shape \
-      -track &DATA_DIR;/bdeck/genesis/atcf/2021 \
+      -shape &DATA_DIR;/genesis/shape/atl \
+      -shape &DATA_DIR;/genesis/shape/epac \
+      -track &DATA_DIR;/genesis/atcf/2021 \
       -config &CONFIG_DIR;/TCGenConfig_shape \
-      -out &OUTPUT_DIR;/tc_gen/tc_gen_shape \
-      -log &OUTPUT_DIR;/tc_gen/tc_gen_shape.log \
-      -v 5 
+      -out &OUTPUT_DIR;/tc_gen/tc_gen_2021_shape \
+      -log &OUTPUT_DIR;/tc_gen/tc_gen_2021_shape.log \
+      -v 3
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/tc_gen/tc_gen_shape.stat</stat>
-      <stat>&OUTPUT_DIR;/tc_gen/tc_gen_shape_pct.txt</stat>
+      <stat>&OUTPUT_DIR;/tc_gen/tc_gen_2021_shape.stat</stat>
+      <stat>&OUTPUT_DIR;/tc_gen/tc_gen_2021_shape_pct.txt</stat>
     </output>
   </test>