diff --git a/godo_test.go b/godo_test.go
index f16377f..c665b3e 100644
--- a/godo_test.go
+++ b/godo_test.go
@@ -513,3 +513,24 @@ func TestCustomUserAgent(t *testing.T) {
 		t.Errorf("New() UserAgent = %s; expected %s", got, expected)
 	}
 }
+
+func TestCustomBaseURL(t *testing.T) {
+	baseURL := "http://localhost/foo"
+	c, err := New(nil, SetBaseURL(baseURL))
+
+	if err != nil {
+		t.Fatalf("New() unexpected error: %v", err)
+	}
+
+	expected := baseURL
+	if got := c.BaseURL.String(); got != expected {
+		t.Errorf("New() BaseURL = %s; expected %s", got, expected)
+	}
+}
+
+func TestCustomBaseURL_badURL(t *testing.T) {
+	baseURL := ":"
+	_, err := New(nil, SetBaseURL(baseURL))
+
+	testURLParseError(t, err)
+}