diff --git a/tools/h5repack/h5repack.sh b/tools/h5repack/h5repack.sh
index 2b8168d58c..f7b6526425 100644
--- a/tools/h5repack/h5repack.sh
+++ b/tools/h5repack/h5repack.sh
@@ -115,9 +115,9 @@ TOOLTEST -i test4.h5 -o test4.out.h5 -f "FLET"
 DIFFTEST test4.h5 test4.out.h5
 TOOLTEST -i test4.h5 -o test4.out.h5 -f "dset1:SHUF" -f "dset1,dset2:GZIP 6"
 DIFFTEST test4.h5 test4.out.h5
-TOOLTEST -i test4.h5 -o test4.out.h5 -l "dset1:CHUNK 20x20" -f "dset1,dset2:SZIP 8"
+TOOLTEST -i test4.h5 -o test4.out.h5 -l "dset1:CHUNK 20x10" -f "dset1,dset2:SZIP 8"
 DIFFTEST test4.h5 test4.out.h5
-TOOLTEST -i test4.h5 -o test4.out.h5 -l "CHUNK 20x20" 
+TOOLTEST -i test4.h5 -o test4.out.h5 -l "CHUNK 20x10" 
 DIFFTEST test4.h5 test4.out.h5
 TOOLTEST -i test4.h5 -o test4.out.h5 -l "COMPA" 
 DIFFTEST test4.h5 test4.out.h5
@@ -131,6 +131,4 @@ TOOLTEST -i test4.h5 -o test4.out.h5 -e "h5repack_info.txt"
 DIFFTEST test4.h5 test4.out.h5
 
 
-
-
 exit $nerrors
diff --git a/tools/h5repack/testh5repack_filters.c b/tools/h5repack/testh5repack_filters.c
index 1cc0e68cee..df2ba80ec2 100644
--- a/tools/h5repack/testh5repack_filters.c
+++ b/tools/h5repack/testh5repack_filters.c
@@ -91,7 +91,6 @@ int make_filters(hid_t loc_id)
  * make several dataset with filters
  *-------------------------------------------------------------------------
  */
-  
  /* create a space */
  if((sid = H5Screate_simple(RANK, dims, NULL))<0)
   return -1;
@@ -102,8 +101,6 @@ int make_filters(hid_t loc_id)
  if(H5Pset_chunk(dcpl, RANK, chunk_dims)<0)
   goto out;
 
-
-
 /*-------------------------------------------------------------------------
  * SZIP
  *-------------------------------------------------------------------------
@@ -145,7 +142,7 @@ int make_filters(hid_t loc_id)
  * checksum
  *-------------------------------------------------------------------------
  */
-#if 1
+#if defined (H5_HAVE_FILTER_FLETCHER32)
  /* remove the filters from the dcpl */
  if (H5Premove_filter(dcpl,H5Z_FILTER_ALL)<0) 
   goto out;
diff --git a/tools/h5repack/testh5repack_main.c b/tools/h5repack/testh5repack_main.c
index 2bcee2751e..d5cca6ea57 100644
--- a/tools/h5repack/testh5repack_main.c
+++ b/tools/h5repack/testh5repack_main.c
@@ -807,8 +807,10 @@ test_filterqueue(void)
   TEST_ERROR;
  if (h5repack_addlayout("dset1:CHUNK 20x10",&pack_options)<0)
   TEST_ERROR;
+#if defined (H5_HAVE_FILTER_FLETCHER32)
  if (h5repack_addfilter("dset1:FLET",&pack_options)<0)
   TEST_ERROR;
+#endif
  if (h5repack_addfilter("dset1:SHUF",&pack_options)<0)
   TEST_ERROR;
  if (h5repack_addfilter("dset1:SZIP 8",&pack_options)<0)