diff --git a/src/2d/Makefile b/src/2d/Makefile
index 541d4c21d..9df19c1d7 100644
--- a/src/2d/Makefile
+++ b/src/2d/Makefile
@@ -7,7 +7,7 @@
 # Makefile for Clawpack code in this directory.
 # This version only sets the local files and frequently changed
 # options, and then includes the standard makefile pointed to by CLAWMAKE.
-CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
 
 # See the above file for details and a list of make options, or type
 #   make .help
@@ -17,13 +17,8 @@ CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
 # an f90 compiler such as gfortran.
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FC ?= gfortran   # default if not set as environment variable
 # Add any desired compiler flags such as -g here:
-# INTEL ifort flags
-#FFLAGS ?=  -g -C -CB -CU -fpe0 -ftrapuv
-# gfortran flags
-# #FFLAGS = -g -fbounds-check -ffpe-trap=invalid,overflow,zero
-
+FFLAGS ?=  
 
 CLAW_LIB = $(shell pwd)
 
diff --git a/tests/acoustics-example1/Makefile b/tests/acoustics-example1/Makefile
index cab948d2b..7c1f5e0ec 100644
--- a/tests/acoustics-example1/Makefile
+++ b/tests/acoustics-example1/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Clawpack code in this directory.
 # This version only sets the local files and frequently changed
 # options, and then includes the standard makefile pointed to by CLAWMAKE.
-CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
 
 # See the above file for details and a list of make options, or type
 #   make .help
@@ -23,9 +23,9 @@ OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
 RESTART ?= False                    # Should = clawdata.restart in setrun
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FC ?= gfortran   # default if not set as environment variable
-# Add any desired compiler flags such as -g here:
-FFLAGS ?=  -O2 -fopenmp
+
+# Compiler flags can be specified here or set as an environment variable
+FFLAGS ?=  
 
 # ---------------------------------
 # List of sources for this program:
diff --git a/tests/annulus/Makefile b/tests/annulus/Makefile
index bc2ea4cc7..bd975b532 100644
--- a/tests/annulus/Makefile
+++ b/tests/annulus/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Clawpack code in this directory.
 # This version only sets the local files and frequently changed
 # options, and then includes the standard makefile pointed to by CLAWMAKE.
-CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
 
 # See the above file for details and a list of make options, or type
 #   make .help
@@ -23,13 +23,10 @@ OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
 RESTART ?= False                    # Should = clawdata.restart in setrun
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FC ?= gfortran   # default if not set as environment variable
 
-# Add any desired compiler flags such as -g here:
-FFLAGS ?= -O2 -fopenmp
-#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
-# intel ifort flags
-# FFLAGS =  -g -C -CB -CU -fpe0 -ftrapuv
+# Compiler flags can be specified here or set as an environment variable
+FFLAGS ?=  
+
 
 # ---------------------------------
 # List of sources for this program:
diff --git a/tests/burgers_pwconst/Makefile b/tests/burgers_pwconst/Makefile
index 13f261d72..f285c4501 100644
--- a/tests/burgers_pwconst/Makefile
+++ b/tests/burgers_pwconst/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Clawpack code in this directory.
 # This version only sets the local files and frequently changed
 # options, and then includes the standard makefile pointed to by CLAWMAKE.
-CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
 
 # See the above file for details and a list of make options, or type
 #   make .help
@@ -23,12 +23,10 @@ OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
 RESTART ?= False                    # Should = clawdata.restart in setrun
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FC ?= gfortran   # default if not set as environment variable
-# Add any desired compiler flags such as -g here:
-FFLAGS ?= -O2 -fopenmp
-#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
-# intel ifort flags
-# FFLAGS =  -g -C -CB -CU -fpe0 -ftrapuv
+
+# Compiler flags can be specified here or set as an environment variable
+FFLAGS ?=  
+
 
 # ---------------------------------
 # List of sources for this program:
diff --git a/tests/example1/Makefile b/tests/example1/Makefile
index bd5f76d0a..f638f0caf 100644
--- a/tests/example1/Makefile
+++ b/tests/example1/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Clawpack code in this directory.
 # This version only sets the local files and frequently changed
 # options, and then includes the standard makefile pointed to by CLAWMAKE.
-CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
 
 # See the above file for details and a list of make options, or type
 #   make .help
@@ -23,13 +23,10 @@ OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
 RESTART ?= False                    # Should = clawdata.restart in setrun
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FC ?= gfortran   # default if not set as environment variable
 
-# Add any desired compiler flags such as -g here:
-FFLAGS ?= -O2 -fopenmp
-#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
-# intel ifort flags
-# FFLAGS =  -g -C -CB -CU -fpe0 -ftrapuv
+# Compiler flags can be specified here or set as an environment variable
+FFLAGS ?=  
+
 
 # ---------------------------------
 # List of sources for this program:
diff --git a/tests/quadrants/Makefile b/tests/quadrants/Makefile
index ed5bfd743..eab7434d6 100644
--- a/tests/quadrants/Makefile
+++ b/tests/quadrants/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Clawpack code in this directory.
 # This version only sets the local files and frequently changed
 # options, and then includes the standard makefile pointed to by CLAWMAKE.
-CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
 
 # See the above file for details and a list of make options, or type
 #   make .help
@@ -23,13 +23,10 @@ OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
 RESTART ?= True                     # Should = clawdata.restart in setrun
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FC ?= gfortran   # default if not set as environment variable
 
-# Add any desired compiler flags such as -g here:
-FFLAGS ?= -O2 
-#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
-# intel ifort flags
-# FFLAGS =  -g -C -CB -CU -fpe0 -ftrapuv
+# Compiler flags can be specified here or set as an environment variable
+FFLAGS ?=  
+
 
 
 # ---------------------------------
diff --git a/tests/shockbubble/Makefile b/tests/shockbubble/Makefile
index e235fc717..ecdebf08d 100644
--- a/tests/shockbubble/Makefile
+++ b/tests/shockbubble/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Clawpack code in this directory.
 # This version only sets the local files and frequently changed
 # options, and then includes the standard makefile pointed to by CLAWMAKE.
-CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
 
 # See the above file for details and a list of make options, or type
 #   make .help
@@ -23,13 +23,10 @@ OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
 RESTART ?= False                    # Should = clawdata.restart in setrun
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FC ?= gfortran   # default if not set as environment variable
 
-# Add any desired compiler flags such as -g here:
-FFLAGS ?= -O2 -fopenmp
-#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
-# intel ifort flags
-# FFLAGS =  -g -C -CB -CU -fpe0 -ftrapuv
+# Compiler flags can be specified here or set as an environment variable
+FFLAGS ?=  
+
 
 
 # ---------------------------------
diff --git a/tests/swirl/Makefile b/tests/swirl/Makefile
index 7bc950015..d4aed2197 100644
--- a/tests/swirl/Makefile
+++ b/tests/swirl/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Clawpack code in this directory.
 # This version only sets the local files and frequently changed
 # options, and then includes the standard makefile pointed to by CLAWMAKE.
-CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
 
 # See the above file for details and a list of make options, or type
 #   make .help
@@ -22,16 +22,11 @@ PLOTDIR = _plots	                # Directory for plots
 OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
 RESTART ?= False                    # Should = clawdata.restart in setrun
 
-#FC = ifort
-#FFLAGS = -C -CB -CU -fpe1  -ftz -ftrapuv  -g -fp-model precise 
-#FFLAGS = -C -CB -CU -fpe1 -ftrapuv  -O2 -fp-model precise -openmp
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FC ?= gfortran   # default if not set as environment variable
-# Add any desired compiler flags such as -g here:
-FFLAGS ?= -O2 -fopenmp
-#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
-# intel ifort flags
-# FFLAGS =  -g -C -CB -CU -fpe0 -ftrapuv
+
+# Compiler flags can be specified here or set as an environment variable
+FFLAGS ?=  
+
 
 # ---------------------------------
 # List of sources for this program:
diff --git a/tests/swirl_regression/Makefile b/tests/swirl_regression/Makefile
index c80edb916..d4aed2197 100644
--- a/tests/swirl_regression/Makefile
+++ b/tests/swirl_regression/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Clawpack code in this directory.
 # This version only sets the local files and frequently changed
 # options, and then includes the standard makefile pointed to by CLAWMAKE.
-CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
 
 # See the above file for details and a list of make options, or type
 #   make .help
@@ -22,17 +22,11 @@ PLOTDIR = _plots	                # Directory for plots
 OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
 RESTART ?= False                    # Should = clawdata.restart in setrun
 
-#FC = ifort
-#FFLAGS = -C -CB -CU -fpe1  -ftz -ftrapuv  -g -fp-model precise 
-#FFLAGS = -C -CB -CU -fpe1 -ftrapuv  -O2 -fp-model precise -openmp
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FC ?= gfortran   # default if not set as environment variable
-# Add any desired compiler flags such as -g here:
-#FFLAGS ?= -O2 -fopenmp
-FFLAGS ?= -O2 
-#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
-# intel ifort flags
-# FFLAGS =  -g -C -CB -CU -fpe0 -ftrapuv
+
+# Compiler flags can be specified here or set as an environment variable
+FFLAGS ?=  
+
 
 # ---------------------------------
 # List of sources for this program:
diff --git a/tests/test_changeFlagging/Makefile b/tests/test_changeFlagging/Makefile
index 0afa47bde..8f171a667 100644
--- a/tests/test_changeFlagging/Makefile
+++ b/tests/test_changeFlagging/Makefile
@@ -1,7 +1,7 @@
 # Makefile for Clawpack code in this directory.
 # This version only sets the local files and frequently changed
 # options, and then includes the standard makefile pointed to by CLAWMAKE.
-CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
 
 # See the above file for details and a list of make options, or type
 #   make .help
@@ -22,13 +22,10 @@ OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
 RESTART ?= False                    # Should = clawdata.restart in setrun
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FC ?= gfortran   # default if not set as environment variable
 
-# Add any desired compiler flags such as -g here:
-FFLAGS ?= -O2 
-#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
-# intel ifort flags
-# FFLAGS =  -g -C -CB -CU -fpe0 -ftrapuv
+# Compiler flags can be specified here or set as an environment variable
+FFLAGS ?=  
+
 
 # ---------------------------------
 # List of sources for this program:
@@ -155,4 +152,4 @@ SOURCES = \
 
 #-------------------------------------------------------------------
 # Include Makefile containing standard definitions and make options:
-include $(CLAWMAKE)
\ No newline at end of file
+include $(CLAWMAKE)