diff --git a/middleware/redirect/redirect_test.go b/middleware/redirect/redirect_test.go
new file mode 100644
index 000000000..af6bb538c
--- /dev/null
+++ b/middleware/redirect/redirect_test.go
@@ -0,0 +1,55 @@
+package redirect
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/mholt/caddy/middleware"
+)
+
+func TestRedirect(t *testing.T) {
+	for i, test := range []struct {
+		from             string
+		expectedLocation string
+	}{
+		{"/from", "/to"},
+		{"/a", "/b"},
+		{"/aa", ""},
+		{"/", ""},
+		{"/a?foo=bar", "/b"},
+		{"/asdf?foo=bar", ""},
+		{"/foo#bar", ""},
+		{"/a#foo", "/b"},
+	} {
+		var nextCalled bool
+
+		re := Redirect{
+			Next: middleware.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
+				nextCalled = true
+				return 0, nil
+			}),
+			Rules: []Rule{
+				{From: "/from", To: "/to"},
+				{From: "/a", To: "/b"},
+			},
+		}
+
+		req, err := http.NewRequest("GET", test.from, nil)
+		if err != nil {
+			t.Fatalf("Test %d: Could not create HTTP request: %v", i, err)
+		}
+
+		rec := httptest.NewRecorder()
+		re.ServeHTTP(rec, req)
+
+		if rec.Header().Get("Location") != test.expectedLocation {
+			t.Errorf("Test %d: Expected Location header to be %q but was %q",
+				i, test.expectedLocation, rec.Header().Get("Location"))
+		}
+
+		if nextCalled && test.expectedLocation != "" {
+			t.Errorf("Test %d: Next handler was unexpectedly called", i)
+		}
+	}
+}