diff --git a/remoteconfig_test.go b/remoteconfig_test.go
index 635cea8..3796ccc 100644
--- a/remoteconfig_test.go
+++ b/remoteconfig_test.go
@@ -587,7 +587,7 @@ func (s *RemoteConfigSuite) TestLoadConfigFromURLError() {
 	c := &SQSQueueConfig{}
 	err := LoadConfigFromURL("invalid", c)
 	assert.NotNil(s.T(), err)
-	assert.EqualError(s.T(), err, "Get invalid: unsupported protocol scheme \"\"")
+	assert.EqualError(s.T(), err, "Get \"invalid\": unsupported protocol scheme \"\"")
 }
 
 func (s *RemoteConfigSuite) TestReadJSONValidate() {
diff --git a/s3_config.go b/s3_config.go
index 4131dde..f8f6067 100644
--- a/s3_config.go
+++ b/s3_config.go
@@ -10,10 +10,10 @@ const (
 )
 
 type S3Config struct {
-	Endpoint *string    `json:"endpoint,omitempty" remoteconfig:"optional"`
-	Bucket   *string    `json:"bucket,omitempty"`                         // i.e. bucket
-	Region   *AWSRegion `json:"region,omitempty"`                         // i.e. us-west-2
-	Expiry   *uint      `json:"expiry,omitempty" remoteconfig:"optional"` // i.e. 60
+	Endpoint *string    `json:"endpoint,omitempty" yaml:"endpoint,omitempty" remoteconfig:"optional"`
+	Bucket   *string    `json:"bucket,omitempty" yaml:"bucket,omitempty"`                         // i.e. bucket
+	Region   *AWSRegion `json:"region,omitempty" yaml:"region,omitempty"`                         // i.e. us-west-2
+	Expiry   *uint      `json:"expiry,omitempty" yaml:"expiry,omitempty" remoteconfig:"optional"` // i.e. 60
 }
 
 func (c S3Config) GetEndpoint() string {
diff --git a/s3_endpoint_expiry_config.go b/s3_endpoint_expiry_config.go
index 2296046..b439093 100644
--- a/s3_endpoint_expiry_config.go
+++ b/s3_endpoint_expiry_config.go
@@ -5,8 +5,8 @@ const (
 )
 
 type S3EndpointExpiryConfig struct {
-	Endpoint *string `json:"endpoint,omitempty" remoteconfig:"optional"`
-	Expiry   *uint   `json:"expiry,omitempty" remoteconfig:"optional"`
+	Endpoint *string `json:"endpoint,omitempty" yaml:"endpoint,omitempty" remoteconfig:"optional"`
+	Expiry   *uint   `json:"expiry,omitempty" yaml:"expiry,omitempty" remoteconfig:"optional"`
 }
 
 func (c S3EndpointExpiryConfig) GetEndpoint() string {