diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index b03e832d..d1faf2a3 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -53,6 +53,18 @@ func compareStorageConfigs(parsedStorage *StorageConfig, expStorage *StorageConf
 	}
 }
 
+func TestPortDefaultsCorrectly(t *testing.T) {
+	conf := &Config{}
+	err := envOverride(conf)
+	if err != nil {
+		t.Fatalf("Env override failed: %v", err)
+	}
+	expPort := ":3000"
+	if conf.Proxy.Port != expPort {
+		t.Errorf("Port was incorrect. Got: %s, want: %s", conf.Proxy.Port, expPort)
+	}
+}
+
 func TestEnvOverrides(t *testing.T) {
 
 	expProxy := ProxyConfig{
@@ -298,7 +310,7 @@ func getEnvMap(config *Config) map[string]string {
 	if proxy != nil {
 		envVars["ATHENS_STORAGE_TYPE"] = proxy.StorageType
 		envVars["ATHENS_GLOBAL_ENDPOINT"] = proxy.GlobalEndpoint
-		envVars["PORT"] = proxy.Port
+		envVars["ATHENS_PORT"] = proxy.Port
 		envVars["BASIC_AUTH_USER"] = proxy.BasicAuthUser
 		envVars["BASIC_AUTH_PASS"] = proxy.BasicAuthPass
 		envVars["PROXY_FORCE_SSL"] = strconv.FormatBool(proxy.ForceSSL)
diff --git a/pkg/config/proxy.go b/pkg/config/proxy.go
index a1adffc9..d6398a5e 100644
--- a/pkg/config/proxy.go
+++ b/pkg/config/proxy.go
@@ -4,7 +4,7 @@ package config
 type ProxyConfig struct {
 	StorageType    string `validate:"required" envconfig:"ATHENS_STORAGE_TYPE"`
 	GlobalEndpoint string `envconfig:"ATHENS_GLOBAL_ENDPOINT"` // This feature is not yet implemented
-	Port           string `validate:"required" envconfig:"PORT"`
+	Port           string `envconfig:"ATHENS_PORT" default:":3000"`
 	BasicAuthUser  string `envconfig:"BASIC_AUTH_USER"`
 	BasicAuthPass  string `envconfig:"BASIC_AUTH_PASS"`
 	ForceSSL       bool   `envconfig:"PROXY_FORCE_SSL"`