diff --git a/installer/pkg/config/aws/aws.go b/installer/pkg/config/aws/aws.go
index 579eec846dc..c3dbf1f122b 100644
--- a/installer/pkg/config/aws/aws.go
+++ b/installer/pkg/config/aws/aws.go
@@ -20,17 +20,17 @@ const (
 
 // AWS converts AWS related config.
 type AWS struct {
-	EC2AMIOverride            string              `json:"tectonic_aws_ec2_ami_override,omitempty" yaml:"ec2AMIOverride,omitempty"`
-	Endpoints                 Endpoints           `json:"tectonic_aws_endpoints,omitempty" yaml:"endpoints,omitempty"`
-	Etcd                      `json:",inline" yaml:"etcd,omitempty"`
-	External                  `json:",inline" yaml:"external,omitempty"`
-	ExtraTags                 map[string]string `json:"tectonic_aws_extra_tags,omitempty" yaml:"extraTags,omitempty"`
-	InstallerRole             string            `json:"tectonic_aws_installer_role,omitempty" yaml:"installerRole,omitempty"`
-	Master                    `json:",inline" yaml:"master,omitempty"`
-	Profile                   string `json:"tectonic_aws_profile,omitempty" yaml:"profile,omitempty"`
-	Region                    string `json:"tectonic_aws_region,omitempty" yaml:"region,omitempty"`
-	VPCCIDRBlock              string `json:"tectonic_aws_vpc_cidr_block,omitempty" yaml:"vpcCIDRBlock,omitempty"`
-	Worker                    `json:",inline" yaml:"worker,omitempty"`
+	EC2AMIOverride string    `json:"tectonic_aws_ec2_ami_override,omitempty" yaml:"ec2AMIOverride,omitempty"`
+	Endpoints      Endpoints `json:"tectonic_aws_endpoints,omitempty" yaml:"endpoints,omitempty"`
+	Etcd           `json:",inline" yaml:"etcd,omitempty"`
+	External       `json:",inline" yaml:"external,omitempty"`
+	ExtraTags      map[string]string `json:"tectonic_aws_extra_tags,omitempty" yaml:"extraTags,omitempty"`
+	InstallerRole  string            `json:"tectonic_aws_installer_role,omitempty" yaml:"installerRole,omitempty"`
+	Master         `json:",inline" yaml:"master,omitempty"`
+	Profile        string `json:"tectonic_aws_profile,omitempty" yaml:"profile,omitempty"`
+	Region         string `json:"tectonic_aws_region,omitempty" yaml:"region,omitempty"`
+	VPCCIDRBlock   string `json:"tectonic_aws_vpc_cidr_block,omitempty" yaml:"vpcCIDRBlock,omitempty"`
+	Worker         `json:",inline" yaml:"worker,omitempty"`
 }
 
 // External converts external related config.
diff --git a/installer/pkg/config/libvirt/libvirt.go b/installer/pkg/config/libvirt/libvirt.go
index 425af0d9e7b..02ee58586f8 100644
--- a/installer/pkg/config/libvirt/libvirt.go
+++ b/installer/pkg/config/libvirt/libvirt.go
@@ -22,7 +22,7 @@ type Libvirt struct {
 	MasterIPs     []string `json:"tectonic_libvirt_master_ips,omitempty" yaml:"masterIPs"`
 	WorkerIPs     []string `json:"tectonic_libvirt_worker_ips,omitempty" yaml:"workerIPs"`
 	EtcdIPs       []string `json:"tectonic_libvirt_etcd_ips,omitempty" yaml:"etcdIPs"`
-	BootstrapIP   string `json:"tectonic_libvirt_bootstrap_ip,omitempty" yaml:"bootstrapIP"`
+	BootstrapIP   string   `json:"tectonic_libvirt_bootstrap_ip,omitempty" yaml:"bootstrapIP"`
 }
 
 // Network describes a libvirt network configuration.
diff --git a/installer/pkg/workflow/init_test.go b/installer/pkg/workflow/init_test.go
index 6b5d224275a..89ae62a560f 100644
--- a/installer/pkg/workflow/init_test.go
+++ b/installer/pkg/workflow/init_test.go
@@ -125,7 +125,7 @@ func TestGenerateTerraformVariablesStep(t *testing.T) {
 	}
 	expected := string(expectedData)
 
-	if got + "\n" != expected {
+	if got+"\n" != expected {
 		t.Errorf("expected: %s, got: %s", expected, got)
 	}
 }
diff --git a/pkg/asset/installconfig/installconfig_test.go b/pkg/asset/installconfig/installconfig_test.go
index 32fcb585a37..035571734b9 100644
--- a/pkg/asset/installconfig/installconfig_test.go
+++ b/pkg/asset/installconfig/installconfig_test.go
@@ -120,28 +120,28 @@ func TestInstallConfigGenerate(t *testing.T) {
 			}
 
 			states := map[asset.Asset]*asset.State{
-				stock.clusterID: &asset.State{
+				stock.clusterID: {
 					Contents: []asset.Content{{Data: []byte("test-cluster-id")}},
 				},
-				stock.emailAddress: &asset.State{
+				stock.emailAddress: {
 					Contents: []asset.Content{{Data: []byte("test-email")}},
 				},
-				stock.password: &asset.State{
+				stock.password: {
 					Contents: []asset.Content{{Data: []byte("test-password")}},
 				},
-				stock.baseDomain: &asset.State{
+				stock.baseDomain: {
 					Contents: []asset.Content{{Data: []byte("test-domain")}},
 				},
-				stock.clusterName: &asset.State{
+				stock.clusterName: {
 					Contents: []asset.Content{{Data: []byte("test-cluster-name")}},
 				},
-				stock.license: &asset.State{
+				stock.license: {
 					Contents: []asset.Content{{Data: []byte("test-license")}},
 				},
-				stock.pullSecret: &asset.State{
+				stock.pullSecret: {
 					Contents: []asset.Content{{Data: []byte("test-pull-secret")}},
 				},
-				stock.platform: &asset.State{
+				stock.platform: {
 					Contents: make([]asset.Content, len(tc.platformContents)),
 				},
 			}