diff --git a/command/agent/consul/catalog_testing.go b/command/agent/consul/catalog_testing.go
index 4630560d4..29abb5d90 100644
--- a/command/agent/consul/catalog_testing.go
+++ b/command/agent/consul/catalog_testing.go
@@ -63,7 +63,7 @@ func (c *MockAgent) SetStatus(s string) string {
 
 func (c *MockAgent) Self() (map[string]map[string]interface{}, error) {
 	s := map[string]map[string]interface{}{
-		"Member": map[string]interface{}{
+		"Member": {
 			"Addr":        "127.0.0.1",
 			"DelegateCur": 4,
 			"DelegateMax": 5,
diff --git a/nomad/fsm_test.go b/nomad/fsm_test.go
index d91e821d7..5c2ed08cb 100644
--- a/nomad/fsm_test.go
+++ b/nomad/fsm_test.go
@@ -644,14 +644,14 @@ func TestFSM_BatchDeregisterJob(t *testing.T) {
 
 	req3 := structs.JobBatchDeregisterRequest{
 		Jobs: map[structs.NamespacedID]*structs.JobDeregisterOptions{
-			structs.NamespacedID{
+			{
 				ID:        job.ID,
 				Namespace: job.Namespace,
-			}: &structs.JobDeregisterOptions{},
-			structs.NamespacedID{
+			}: {},
+			{
 				ID:        job2.ID,
 				Namespace: job2.Namespace,
-			}: &structs.JobDeregisterOptions{
+			}: {
 				Purge: true,
 			},
 		},
diff --git a/nomad/job_endpoint_test.go b/nomad/job_endpoint_test.go
index 7de9d3ef7..7d0d0e770 100644
--- a/nomad/job_endpoint_test.go
+++ b/nomad/job_endpoint_test.go
@@ -1841,14 +1841,14 @@ func TestJobEndpoint_BatchDeregister(t *testing.T) {
 	// Deregister
 	dereg := &structs.JobBatchDeregisterRequest{
 		Jobs: map[structs.NamespacedID]*structs.JobDeregisterOptions{
-			structs.NamespacedID{
+			{
 				ID:        job.ID,
 				Namespace: job.Namespace,
-			}: &structs.JobDeregisterOptions{},
-			structs.NamespacedID{
+			}: {},
+			{
 				ID:        job2.ID,
 				Namespace: job2.Namespace,
-			}: &structs.JobDeregisterOptions{
+			}: {
 				Purge: true,
 			},
 		},
@@ -1911,14 +1911,14 @@ func TestJobEndpoint_BatchDeregister_ACL(t *testing.T) {
 	// Deregister
 	req := &structs.JobBatchDeregisterRequest{
 		Jobs: map[structs.NamespacedID]*structs.JobDeregisterOptions{
-			structs.NamespacedID{
+			{
 				ID:        job.ID,
 				Namespace: job.Namespace,
-			}: &structs.JobDeregisterOptions{},
-			structs.NamespacedID{
+			}: {},
+			{
 				ID:        job2.ID,
 				Namespace: job2.Namespace,
-			}: &structs.JobDeregisterOptions{},
+			}: {},
 		},
 		WriteRequest: structs.WriteRequest{
 			Region: "global",