diff --git a/pkg/utils/api.go b/pkg/utils/api.go
index a22711b23..ae3a9afc3 100644
--- a/pkg/utils/api.go
+++ b/pkg/utils/api.go
@@ -235,11 +235,11 @@ func parseAPIHost(s string) (APIHost, error) {
 		return APIHost{}, fmt.Errorf("host must have a scheme (http or https): %s", s)
 	}
 
-	if strings.HasSuffix(u.Hostname(), "github.com") {
+	if u.Hostname() == "github.com" || strings.HasSuffix(u.Hostname(), ".github.com") {
 		return newDotcomHost()
 	}
 
-	if strings.HasSuffix(u.Hostname(), "ghe.com") {
+	if u.Hostname() == "ghe.com" || strings.HasSuffix(u.Hostname(), ".ghe.com") {
 		return newGHECHost(s)
 	}
 
diff --git a/pkg/utils/api_test.go b/pkg/utils/api_test.go
new file mode 100644
index 000000000..ad7acb0b6
--- /dev/null
+++ b/pkg/utils/api_test.go
@@ -0,0 +1,75 @@
+package utils
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestParseAPIHost(t *testing.T) {
+	tests := []struct {
+		name        string
+		input       string
+		wantRestURL string
+		wantErr     bool
+	}{
+		{
+			name:        "empty string defaults to dotcom",
+			input:       "",
+			wantRestURL: "https://api.github.com/",
+		},
+		{
+			name:        "github.com hostname",
+			input:       "https://github.com",
+			wantRestURL: "https://api.github.com/",
+		},
+		{
+			name:        "subdomain of github.com",
+			input:       "https://foo.github.com",
+			wantRestURL: "https://api.github.com/",
+		},
+		{
+			name:        "hostname ending in github.com but not a subdomain",
+			input:       "https://mycompanygithub.com",
+			wantRestURL: "https://mycompanygithub.com/api/v3/",
+		},
+		{
+			name:        "hostname ending in notgithub.com",
+			input:       "https://notgithub.com",
+			wantRestURL: "https://notgithub.com/api/v3/",
+		},
+		{
+			name:        "ghe.com hostname",
+			input:       "https://ghe.com",
+			wantRestURL: "https://api.ghe.com/",
+		},
+		{
+			name:        "subdomain of ghe.com",
+			input:       "https://mycompany.ghe.com",
+			wantRestURL: "https://api.mycompany.ghe.com/",
+		},
+		{
+			name:        "hostname ending in ghe.com but not a subdomain",
+			input:       "https://myghe.com",
+			wantRestURL: "https://myghe.com/api/v3/",
+		},
+		{
+			name:    "missing scheme",
+			input:   "github.com",
+			wantErr: true,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			host, err := parseAPIHost(tc.input)
+			if tc.wantErr {
+				assert.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			assert.Equal(t, tc.wantRestURL, host.restURL.String())
+		})
+	}
+}