diff --git a/skimage/feature/template.py b/skimage/feature/template.py
index 67064d5a..b328131f 100644
--- a/skimage/feature/template.py
+++ b/skimage/feature/template.py
@@ -6,7 +6,7 @@ import _template
 from skimage.util.dtype import _convert
 
 
-def match_template(image, template, pad_output=True):
+def match_template(image, template, pad_output=False):
     """Match a template to an image using normalized correlation.
 
     The output is an array with values between -1.0 and 1.0, which correspond
diff --git a/skimage/feature/tests/test_template.py b/skimage/feature/tests/test_template.py
index dd24cbd6..c6df75d0 100644
--- a/skimage/feature/tests/test_template.py
+++ b/skimage/feature/tests/test_template.py
@@ -59,8 +59,8 @@ def test_normalization():
     sorted_result = np.argsort(result.flat)
     iflat_min = sorted_result[0]
     iflat_max = sorted_result[-1]
-    min_result = np.unravel_index(iflat_min, (N, N))
-    max_result = np.unravel_index(iflat_max, (N, N))
+    min_result = np.unravel_index(iflat_min, result.shape)
+    max_result = np.unravel_index(iflat_max, result.shape)
 
     # shift result by 1 because of template border
     assert np.all((np.array(min_result) + 1) == (ineg, jneg))