diff --git a/tests/Makefile.am b/tests/Makefile.am
index c58b54d72..57e1eb045 100755
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,42 +1,39 @@
+TESTS = definitions.sh \
+        ieee.sh grib1to2.sh \
+        unit_tests.sh \
+        grib2to1.sh badgrib.sh ls.sh convert.sh filter.sh  \
+        multi.sh budg.sh gridType.sh concept.sh decimalPrecision.sh \
+        bitsPerValue.sh get_fail.sh missing.sh \
+        local.sh step.sh set.sh iterator.sh \
+        compare.sh level.sh index.sh \
+        bitmap.sh list.sh second_order.sh \
+        multi_from_message.sh change_scanning.sh \
+        julian.sh statistics.sh tigge.sh tigge_conversions.sh \
+        read_any.sh padding.sh lamb_az_eq_area.sh grib_to_netcdf.sh debug.sh $(JPEG_TEST)
 
-     TESTS = definitions.sh \
-			 ieee.sh grib1to2.sh \
-			 unit_tests.sh \
-	       grib2to1.sh badgrib.sh ls.sh convert.sh filter.sh  \
-	       multi.sh budg.sh gridType.sh concept.sh decimalPrecision.sh \
-			 bitsPerValue.sh get_fail.sh missing.sh \
-			 local.sh step.sh set.sh iterator.sh \
-			 compare.sh level.sh index.sh \
-			 bitmap.sh list.sh second_order.sh \
-			 multi_from_message.sh change_scanning.sh \
-			 julian.sh statistics.sh tigge.sh tigge_conversions.sh \
-			 read_any.sh padding.sh lamb_az_eq_area.sh grib_to_netcdf.sh debug.sh $(JPEG_TEST)
+noinst_PROGRAMS = packing_check gauss_sub read_any double_cmp packing pack_unpack \
+                  multi_from_message julian read_index index gribex_perf\
+                  jpeg_perf so_perf png_perf bpv_limit laplacian unit_tests
 
-     noinst_PROGRAMS = packing_check gauss_sub read_any double_cmp packing pack_unpack \
-	                   multi_from_message julian read_index index gribex_perf\
-	                   jpeg_perf so_perf png_perf bpv_limit laplacian unit_tests
+multi_from_message_SOURCES = multi_from_message.c
+laplacian_SOURCES = laplacian.c
+packing_SOURCES = packing.c
+packing_check_SOURCES = packing_check.c
+read_any_SOURCES = read_any.c
+double_cmp_SOURCES = double_cmp.c
+pack_unpack_SOURCES = pack_unpack.c
+julian_SOURCES = julian.c
+unit_tests_SOURCES = unit_tests.c
+index_SOURCES = index.c
+read_index_SOURCES = read_index.c
+jpeg_perf_SOURCES = jpeg_perf.c
+so_perf_SOURCES = so_perf.c
+png_perf_SOURCES = png_perf.c
+gribex_perf_SOURCES = gribex_perf.c
+gauss_sub_SOURCES = gauss_sub.c
 
-	 multi_from_message_SOURCES = multi_from_message.c
-	 laplacian_SOURCES = laplacian.c
-	 packing_SOURCES = packing.c
-	 packing_check_SOURCES = packing_check.c
-	 list_keys_SOURCES = list_keys.c
-	 read_any_SOURCES = read_any.c
-	 double_cmp_SOURCES = double_cmp.c
-	 pack_unpack_SOURCES = pack_unpack.c
-	 julian_SOURCES = julian.c
-	 unit_tests_SOURCES = unit_tests.c
-	 index_SOURCES = index.c
-	 read_index_SOURCES = read_index.c
-	 jpeg_perf_SOURCES = jpeg_perf.c
-	 so_perf_SOURCES = so_perf.c
-	 png_perf_SOURCES = png_perf.c
-	 gribex_perf_SOURCES = gribex_perf.c
-	 gribex_perf_SOURCES = gauss_sub.c
+LDADD = $(top_builddir)/src/libgrib_api.la $(EMOS_LIB)
 
-     LDADD = $(top_builddir)/src/libgrib_api.la $(EMOS_LIB)
+INCLUDES   = -I$(top_builddir)/src
 
-     INCLUDES   = -I$(top_builddir)/src
-
-     EXTRA_DIST = $(TESTS) mf.rules filter_rules include.sh lamb_az_eq_area.ref
- 
+EXTRA_DIST = $(TESTS) mf.rules filter_rules include.sh lamb_az_eq_area.ref