diff --git a/testing/metrics/CMakeLists.txt b/testing/metrics/CMakeLists.txt
index 7ccd8bc224..b7caf46888 100644
--- a/testing/metrics/CMakeLists.txt
+++ b/testing/metrics/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(BASELINE_DIR "${UVCDAT_GIT_TESTDATA_DIR}/baselines/metrics")
+
 # test from VCS, example of a graphics test
 #cdat_add_test(vcs_verify_hurricane_marker
 #  "${PYTHON_EXECUTABLE}"
@@ -12,3 +14,9 @@ cdat_add_test("diags_test_01"
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/metrics/diagtest01.py
   ${UVCMETRICS_TEST_DATA_DIRECTORY} )
+cdat_add_test("diags_test_02"
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/metrics/diagtest02.py
+  --datadir=${UVCMETRICS_TEST_DATA_DIRECTORY}
+  --baseline=${BASELINE_DIR}/metrics/ )
+
diff --git a/testing/metrics/diagtest02.py b/testing/metrics/diagtest02.py
new file mode 100644
index 0000000000..61aed316e7
--- /dev/null
+++ b/testing/metrics/diagtest02.py
@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+
+# Compute a set of contour plots using diags (diags.py).
+# First argument: --datadir=<data location> - with subdirectories cam_output and obs_atmos and baseline.
+# These have sample model output, observation data, and "baseline" output which we should match.
+# However, the graphical output (png files) may not match in manner suitable for automated testing.
+# So the return value only depends on the numerical values in the .nc files.
+# Second argument: '--keep=True' to keep (don't delete) output files*
+# No attempt is made to clean up the diagnostics' cache files, which are generally in /tmp.
+
+print 'Test 2: Diagnostic contour plots ... ',
+
+from metrics.common.utilities import *
+from pprint import pprint
+import sys, os, shutil, tempfile, subprocess
+import cdms2, numpy
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+import argparse
+
+p = argparse.ArgumentParser(description="Basic gm testing code for vcs")
+p.add_argument("--datadir", dest="datadir", help="root directory for model and obs data")
+p.add_argument("--baseline", dest="baseline", help="directory with baseline files for comparing results")
+p.add_argument("--keep", dest="keep", help="Iff True, will keep computed png and nc files")
+args = p.parse_args(sys.argv[1:])
+
+def closeness( varname, filename, pathout, baselinepath, rtol, atol ):
+    fname = os.path.join( pathout, filename )
+    baselinefname = os.path.join( baselinepath, filename )
+    f = cdms2.open( fname )
+    g = cdms2.open( baselinefname )
+    fvar = f(varname)
+    gvar = g(varname)
+    close = numpy.ma.allclose( fvar, gvar, rtol=rtol, atol=atol )
+    if close:
+        print "fvar and gvar are close for", varname
+    else:
+        print "fvar and gvar differ for", varname
+        print "max difference", (fvar-gvar).max()
+        print "min difference", (fvar-gvar).min()
+    f.close()
+    g.close()
+    return close
+
+datadir = args.datadir
+path1 = os.path.join( datadir, 'cam_output' )
+path2 = os.path.join( datadir, 'obs_atmos' )
+baselinepath = args.baseline
+pathout = tempfile.mkdtemp()
+
+diagstr = "diags --outputdir '%s' --model path=%s,climos=no --obs path=%s,filter=\"f_contains('NCEP')\",climos=yes --varopts 850 --package AMWG --set 5 --var T --seasons ANN" % (pathout,path1,path2)
+# nonstandard, suitable for testing:
+#diagstr = "diags --outputdir '%s' --model path=%s,climos=yes --obs path=%s,filter=\"f_contains('NCEP')\",climos=yes --varopts 850 --package AMWG --set 5 --var T --seasons ANN" % (pathout,os.path.join(datadir,'cam_output_climo'),path2)
+proc = subprocess.Popen([diagstr],shell=True)
+proc_status = proc.wait()
+if proc_status!=0: 
+    raise DiagError("diags run failed")
+
+# Test of graphics (png) file match:
+# This just looks at combined plot, aka summary plot, which is a compound of three plots.
+filename = 'set5_Global_ANN_T-combined.png'
+fname = os.path.join( pathout, filename )
+baselinefname = os.path.join( baselinepath, filename )
+threshold = 1.0e6
+graphics_result = checkimage.check_result_image( fname, baselinefname, threshold )
+print "Graphics file",fname,"match difference:",graphics_result
+
+# Test of NetCDF data (nc) file match:
+rtol = 1.0e-3
+atol = 1.0e-2   # suitable for temperatures
+filename = 'T_ANN_at_850_mbar_(1)_None.nc'
+varname = 'dv_T_lp_ANN_ft0_None_None'
+close1 = closeness( varname, filename, pathout, baselinepath, rtol, atol )
+filename = 'T_ANN_at_850_mbar_(2)_None.nc'
+varname = 'dv_T_lp_ANN_ft1_None_None'
+close2 = closeness( varname, filename, pathout, baselinepath, rtol, atol )
+filename = 'T_ANN_at_850_mbar_(1)-(2)_None,_None.nc'
+varname = 'dv_T_lp_ANN_ft0_None_None_dv_T_lp_ANN_ft1_None_None'
+close12 = closeness( varname, filename, pathout, baselinepath, rtol, atol )
+close = close1 and close2 and close12
+
+if args.keep is True:
+    print "saving output in",pathout
+else:
+    shutil.rmtree(pathout)
+
+# The exit value depends on numerical values in the NetCDF file, not on the plot.
+sys.exit( close )