From 5bab9013acd2fbd7ee6c74a8d1539a1a24478e5b Mon Sep 17 00:00:00 2001
From: Samuel Allan <samuel.allan@canonical.com>
Date: Wed, 10 Apr 2024 13:52:52 +0930
Subject: [PATCH 01/32] Handle nova api version > 2.87 for hypervisor

fixes: #3026
---
 openstack/compute/v2/hypervisors/results.go | 76 ++++++++++++---------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/openstack/compute/v2/hypervisors/results.go b/openstack/compute/v2/hypervisors/results.go
index 2e8d244763..ee6046c6c0 100644
--- a/openstack/compute/v2/hypervisors/results.go
+++ b/openstack/compute/v2/hypervisors/results.go
@@ -158,27 +158,31 @@ func (r *Hypervisor) UnmarshalJSON(b []byte) error {
 
 	*r = Hypervisor(s.tmp)
 
-	// Newer versions return the CPU info as the correct type.
-	// Older versions return the CPU info as a string and need to be
-	// unmarshalled by the json parser.
-	var tmpb []byte
-
-	switch t := s.CPUInfo.(type) {
-	case string:
-		tmpb = []byte(t)
-	case map[string]any:
-		tmpb, err = json.Marshal(t)
-		if err != nil {
-			return err
+	// cpu_info doesn't exist after api version 2.87,
+	// see https://docs.openstack.org/api-ref/compute/#id288
+	if s.CPUInfo != nil {
+		// api versions 2.28 to 2.87 return the CPU info as the correct type.
+		// api versions < 2.28 return the CPU info as a string and need to be
+		// unmarshalled by the json parser.
+		var tmpb []byte
+
+		switch t := s.CPUInfo.(type) {
+		case string:
+			tmpb = []byte(t)
+		case map[string]any:
+			tmpb, err = json.Marshal(t)
+			if err != nil {
+				return err
+			}
+		default:
+			return fmt.Errorf("CPUInfo has unexpected type: %T", t)
 		}
-	default:
-		return fmt.Errorf("CPUInfo has unexpected type: %T", t)
-	}
 
-	if len(tmpb) != 0 {
-		err = json.Unmarshal(tmpb, &r.CPUInfo)
-		if err != nil {
-			return err
+		if len(tmpb) != 0 {
+			err = json.Unmarshal(tmpb, &r.CPUInfo)
+			if err != nil {
+				return err
+			}
 		}
 	}
 
@@ -193,22 +197,28 @@ func (r *Hypervisor) UnmarshalJSON(b []byte) error {
 		return fmt.Errorf("Hypervisor version has unexpected type: %T", t)
 	}
 
-	switch t := s.FreeDiskGB.(type) {
-	case int:
-		r.FreeDiskGB = t
-	case float64:
-		r.FreeDiskGB = int(t)
-	default:
-		return fmt.Errorf("Free disk GB has unexpected type: %T", t)
+	// free_disk_gb doesn't exist after api version 2.87
+	if s.FreeDiskGB != nil {
+		switch t := s.FreeDiskGB.(type) {
+		case int:
+			r.FreeDiskGB = t
+		case float64:
+			r.FreeDiskGB = int(t)
+		default:
+			return fmt.Errorf("Free disk GB has unexpected type: %T", t)
+		}
 	}
 
-	switch t := s.LocalGB.(type) {
-	case int:
-		r.LocalGB = t
-	case float64:
-		r.LocalGB = int(t)
-	default:
-		return fmt.Errorf("Local GB has unexpected type: %T", t)
+	// local_gb doesn't exist after api version 2.87
+	if s.LocalGB != nil {
+		switch t := s.LocalGB.(type) {
+		case int:
+			r.LocalGB = t
+		case float64:
+			r.LocalGB = int(t)
+		default:
+			return fmt.Errorf("Local GB has unexpected type: %T", t)
+		}
 	}
 
 	// OpenStack Compute service returns ID in string representation since

From 91f66ee37be7f7b2a0386881e8091d829640db66 Mon Sep 17 00:00:00 2001
From: Samuel Allan <samuel.allan@canonical.com>
Date: Thu, 18 Jul 2024 07:35:37 +0930
Subject: [PATCH 02/32] Add unit test

---
 .../v2/hypervisors/testing/fixtures_test.go   | 68 +++++++++++++++++++
 .../v2/hypervisors/testing/requests_test.go   | 12 ++++
 2 files changed, 80 insertions(+)

diff --git a/openstack/compute/v2/hypervisors/testing/fixtures_test.go b/openstack/compute/v2/hypervisors/testing/fixtures_test.go
index 1942c842e0..a969f1f825 100644
--- a/openstack/compute/v2/hypervisors/testing/fixtures_test.go
+++ b/openstack/compute/v2/hypervisors/testing/fixtures_test.go
@@ -346,6 +346,36 @@ const HypervisorGetEmptyCPUInfoBody = `
 }
 `
 
+// HypervisorAfterV287ResponseBody represents a raw hypervisor GET result with
+// missing cpu_info, free_disk_gb, local_gb as seen after v2.87
+const HypervisorAfterV287ResponseBody = `
+{
+    "hypervisor":{
+        "current_workload":0,
+        "status":"enabled",
+        "state":"up",
+        "disk_available_least":0,
+        "host_ip":"1.1.1.1",
+        "free_ram_mb":7680,
+        "hypervisor_hostname":"fake-mini",
+        "hypervisor_type":"fake",
+        "hypervisor_version":2002000,
+        "id":"c48f6247-abe4-4a24-824e-ea39e108874f",
+        "local_gb_used":0,
+        "memory_mb":8192,
+        "memory_mb_used":512,
+        "running_vms":0,
+        "service":{
+            "host":"e6a37ee802d74863ab8b91ade8f12a67",
+            "id":"9c2566e7-7a54-4777-a1ae-c2662f0c407c",
+            "disabled_reason":null
+        },
+        "vcpus":1,
+        "vcpus_used":0
+    }
+}
+`
+
 // HypervisorUptimeBody represents a raw hypervisor uptime request result with
 // Pike+ release.
 const HypervisorUptimeBody = `
@@ -492,6 +522,7 @@ var (
 	}
 
 	HypervisorEmptyCPUInfo = hypervisors.Hypervisor{
+		CPUInfo:            hypervisors.CPUInfo{},
 		CurrentWorkload:    0,
 		Status:             "enabled",
 		State:              "up",
@@ -517,6 +548,33 @@ var (
 		VCPUsUsed: 0,
 	}
 
+	HypervisorAfterV287Response = hypervisors.Hypervisor{
+		CPUInfo:            hypervisors.CPUInfo{},
+		CurrentWorkload:    0,
+		Status:             "enabled",
+		State:              "up",
+		DiskAvailableLeast: 0,
+		HostIP:             "1.1.1.1",
+		FreeDiskGB:         0,
+		FreeRamMB:          7680,
+		HypervisorHostname: "fake-mini",
+		HypervisorType:     "fake",
+		HypervisorVersion:  2002000,
+		ID:                 "c48f6247-abe4-4a24-824e-ea39e108874f",
+		LocalGB:            0,
+		LocalGBUsed:        0,
+		MemoryMB:           8192,
+		MemoryMBUsed:       512,
+		RunningVMs:         0,
+		Service: hypervisors.Service{
+			Host:           "e6a37ee802d74863ab8b91ade8f12a67",
+			ID:             "9c2566e7-7a54-4777-a1ae-c2662f0c407c",
+			DisabledReason: "",
+		},
+		VCPUs:     1,
+		VCPUsUsed: 0,
+	}
+
 	HypervisorsStatisticsExpected = hypervisors.Statistics{
 		Count:              1,
 		CurrentWorkload:    0,
@@ -604,6 +662,16 @@ func HandleHypervisorGetEmptyCPUInfoSuccessfully(t *testing.T) {
 	})
 }
 
+func HandleHypervisorAfterV287ResponseSuccessfully(t *testing.T) {
+	testhelper.Mux.HandleFunc("/os-hypervisors/"+HypervisorFake.ID, func(w http.ResponseWriter, r *http.Request) {
+		testhelper.TestMethod(t, r, "GET")
+		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+
+		w.Header().Add("Content-Type", "application/json")
+		fmt.Fprintf(w, HypervisorAfterV287ResponseBody)
+	})
+}
+
 func HandleHypervisorUptimeSuccessfully(t *testing.T) {
 	testhelper.Mux.HandleFunc("/os-hypervisors/"+HypervisorFake.ID+"/uptime", func(w http.ResponseWriter, r *http.Request) {
 		testhelper.TestMethod(t, r, "GET")
diff --git a/openstack/compute/v2/hypervisors/testing/requests_test.go b/openstack/compute/v2/hypervisors/testing/requests_test.go
index 900eadc78b..493e8138d1 100644
--- a/openstack/compute/v2/hypervisors/testing/requests_test.go
+++ b/openstack/compute/v2/hypervisors/testing/requests_test.go
@@ -148,6 +148,18 @@ func TestGetHypervisorEmptyCPUInfo(t *testing.T) {
 	testhelper.CheckDeepEquals(t, &expected, actual)
 }
 
+func TestGetHypervisorAfterV287Response(t *testing.T) {
+	testhelper.SetupHTTP()
+	defer testhelper.TeardownHTTP()
+	HandleHypervisorAfterV287ResponseSuccessfully(t)
+
+	expected := HypervisorAfterV287Response
+
+	actual, err := hypervisors.Get(context.TODO(), client.ServiceClient(), expected.ID).Extract()
+	testhelper.AssertNoErr(t, err)
+	testhelper.CheckDeepEquals(t, &expected, actual)
+}
+
 func TestHypervisorsUptime(t *testing.T) {
 	testhelper.SetupHTTP()
 	defer testhelper.TeardownHTTP()

From fbd7eb497d4347e58dda3e54c04677cc308d7bbc Mon Sep 17 00:00:00 2001
From: Pierre Prinetti <pierreprinetti@redhat.com>
Date: Mon, 21 Oct 2024 12:04:40 +0200
Subject: [PATCH 03/32] Fix clear-needinfo

The gh tool must be set to operate on an issue rather than on a PR.
---
 .github/workflows/label-issue.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/label-issue.yaml b/.github/workflows/label-issue.yaml
index 723f4cd04e..a1fbff16e0 100644
--- a/.github/workflows/label-issue.yaml
+++ b/.github/workflows/label-issue.yaml
@@ -9,9 +9,11 @@ jobs:
     name: Clear needinfo
     if: ${{ github.event.issue.user.login }} == ${{ github.event.comment.user.login }}
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
     steps:
-    - run: gh pr edit "$NUMBER" --remove-label "needinfo"
+    - run: gh issue edit "$NUMBER" --remove-label "needinfo"
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GH_REPO: ${{ github.repository }}
-        NUMBER: ${{ github.event.pull_request.number }}
+        NUMBER: ${{ github.event.issue.number }}

From 591cc7409bced4939a95198a723c62da77e9ad6e Mon Sep 17 00:00:00 2001
From: Sharpz7 <adam.mcarthur62@gmail.com>
Date: Wed, 30 Oct 2024 01:06:21 +0000
Subject: [PATCH 04/32] Added fields for Node API Parity

---
 openstack/baremetal/v1/nodes/results.go       |  82 ++++++++---
 .../v1/nodes/testing/fixtures_test.go         | 133 +++++++++++++++---
 2 files changed, 177 insertions(+), 38 deletions(-)

diff --git a/openstack/baremetal/v1/nodes/results.go b/openstack/baremetal/v1/nodes/results.go
index 5c6eb5c190..22babe02d3 100644
--- a/openstack/baremetal/v1/nodes/results.go
+++ b/openstack/baremetal/v1/nodes/results.go
@@ -90,12 +90,19 @@ func (r SubscriptionVendorPassthruResult) Extract() (*SubscriptionVendorPassthru
 	return &s, err
 }
 
+// Link represents a hyperlink and its relationship to the current resource.
+type Link struct {
+	// Href is the URL of the related resource.
+	Href string `json:"href"`
+
+	// Rel describes the relationship of the resource to the current
+	// context (e.g., "self", "bookmark").
+	Rel string `json:"rel"`
+}
+
 // Node represents a node in the OpenStack Bare Metal API.
+// https://docs.openstack.org/api-ref/baremetal/#list-nodes-detailed
 type Node struct {
-	// Whether automated cleaning is enabled or disabled on this node.
-	// Requires microversion 1.47 or later.
-	AutomatedClean *bool `json:"automated_clean"`
-
 	// UUID for the resource.
 	UUID string `json:"uuid"`
 
@@ -183,8 +190,17 @@ type Node struct {
 	// Current deploy step.
 	DeployStep map[string]any `json:"deploy_step"`
 
-	// Current service step.
-	ServiceStep map[string]any `json:"service_step"`
+	// A list of relative links. Includes the self and bookmark links.
+	Links []Link `json:"links"`
+
+	// Links to the collection of ports on this node
+	Ports []Link `json:"ports"`
+
+	// Links to the collection of portgroups on this node.
+	PortGroups []Link `json:"portgroups"`
+
+	// Links to the collection of states. Note that this resource is also used to request state transitions.
+	States []Link `json:"states"`
 
 	// String which can be used by external schedulers to identify this Node as a unit of a specific type of resource.
 	// For more details, see: https://docs.openstack.org/ironic/latest/install/configure-nova-flavors.html
@@ -202,9 +218,6 @@ type Node struct {
 	// Deploy interface for a node, e.g. “iscsi”.
 	DeployInterface string `json:"deploy_interface"`
 
-	// Firmware interface for a node, e.g. “redfish”.
-	FirmwareInterface string `json:"firmware_interface"`
-
 	// Interface used for node inspection, e.g. “no-inspect”.
 	InspectInterface string `json:"inspect_interface"`
 
@@ -232,9 +245,15 @@ type Node struct {
 	// For vendor-specific functionality on this node, e.g. “no-vendor”.
 	VendorInterface string `json:"vendor_interface"`
 
+	// Links to the volume resources.
+	Volume []Link `json:"volume"`
+
 	// Conductor group for a node. Case-insensitive string up to 255 characters, containing a-z, 0-9, _, -, and ..
 	ConductorGroup string `json:"conductor_group"`
 
+	// An optional UUID which can be used to denote the “parent” baremetal node.
+	ParentNode string `json:"parent_node"`
+
 	// The node is protected from undeploying, rebuilding and deletion.
 	Protected bool `json:"protected"`
 
@@ -244,14 +263,42 @@ type Node struct {
 	// A string or UUID of the tenant who owns the baremetal node.
 	Owner string `json:"owner"`
 
+	// A string or UUID of the tenant who is leasing the object.
+	Lessee string `json:"lessee"`
+
+	// A string indicating the shard this node belongs to.
+	Shard string `json:"shard"`
+
+	// Informational text about this node.
+	Description string `json:"description"`
+
+	// The conductor currently servicing a node. This field is read-only.
+	Conductor string `json:"conductor"`
+
+	// The UUID of the allocation associated with the node. If not null, will be the same as instance_uuid
+	// (the opposite is not always true). Unlike instance_uuid, this field is read-only. Please use the
+	// Allocation API to remove allocations.
+	AllocationUUID string `json:"allocation_uuid"`
+
+	// Whether the node is retired. A Node tagged as retired will prevent any further
+	// scheduling of instances, but will still allow for other operations, such as cleaning, to happen
+	Retired bool `json:"retired"`
+
+	// Reason the node is marked as retired.
+	RetiredReason string `json:"retired_reason"`
+
 	// Static network configuration to use during deployment and cleaning.
 	NetworkData map[string]any `json:"network_data"`
 
-	// The UTC date and time when the resource was created, ISO 8601 format.
-	CreatedAt time.Time `json:"created_at"`
+	// Whether automated cleaning is enabled or disabled on this node.
+	// Requires microversion 1.47 or later.
+	AutomatedClean *bool `json:"automated_clean"`
 
-	// The UTC date and time when the resource was updated, ISO 8601 format. May be “null”.
-	UpdatedAt time.Time `json:"updated_at"`
+	// Current service step.
+	ServiceStep map[string]any `json:"service_step"`
+
+	// Firmware interface for a node, e.g. “redfish”.
+	FirmwareInterface string `json:"firmware_interface"`
 
 	// The UTC date and time when the provision state was updated, ISO 8601 format. May be “null”.
 	ProvisionUpdatedAt time.Time `json:"provision_updated_at"`
@@ -262,12 +309,11 @@ type Node struct {
 	// The UTC date and time when the last inspection was finished, ISO 8601 format. May be “null” if inspection hasn't been finished yet.
 	InspectionFinishedAt *time.Time `json:"inspection_finished_at"`
 
-	// Whether the node is retired. A Node tagged as retired will prevent any further
-	// scheduling of instances, but will still allow for other operations, such as cleaning, to happen
-	Retired bool `json:"retired"`
+	// The UTC date and time when the resource was created, ISO 8601 format.
+	CreatedAt time.Time `json:"created_at"`
 
-	// Reason the node is marked as retired.
-	RetiredReason string `json:"retired_reason"`
+	// The UTC date and time when the resource was updated, ISO 8601 format. May be “null”.
+	UpdatedAt time.Time `json:"updated_at"`
 }
 
 // NodePage abstracts the raw results of making a List() request against
diff --git a/openstack/baremetal/v1/nodes/testing/fixtures_test.go b/openstack/baremetal/v1/nodes/testing/fixtures_test.go
index d47d70b13c..d174edde2b 100644
--- a/openstack/baremetal/v1/nodes/testing/fixtures_test.go
+++ b/openstack/baremetal/v1/nodes/testing/fixtures_test.go
@@ -925,23 +925,57 @@ var (
 			"deploy_ramdisk": "http://172.22.0.1/images/tinyipa-stable-rocky.gz",
 			"ipmi_password":  "admin",
 		},
-		DriverInternalInfo:  map[string]any{},
-		Properties:          map[string]any{},
-		InstanceInfo:        map[string]any{},
-		InstanceUUID:        "",
-		ChassisUUID:         "",
-		Extra:               map[string]any{},
-		ConsoleEnabled:      false,
-		RAIDConfig:          map[string]any{},
-		TargetRAIDConfig:    map[string]any{},
-		CleanStep:           map[string]any{},
-		DeployStep:          map[string]any{},
+		DriverInternalInfo: map[string]any{},
+		Properties:         map[string]any{},
+		InstanceInfo:       map[string]any{},
+		InstanceUUID:       "",
+		ChassisUUID:        "",
+		Extra:              map[string]any{},
+		ConsoleEnabled:     false,
+		RAIDConfig:         map[string]any{},
+		TargetRAIDConfig:   map[string]any{},
+		CleanStep:          map[string]any{},
+		DeployStep:         map[string]any{},
+		Links: []nodes.Link{
+			{
+				Href: "http://ironic.example.com:6385/v1/nodes/d2630783-6ec8-4836-b556-ab427c4b581e",
+				Rel:  "self",
+			},
+			{
+				Href: "http://ironic.example.com:6385/nodes/d2630783-6ec8-4836-b556-ab427c4b581e",
+				Rel:  "bookmark",
+			},
+		},
+		Ports: []nodes.Link{
+			{
+				Href: "http://ironic.example.com:6385/v1/nodes/d2630783-6ec8-4836-b556-ab427c4b581e/ports",
+				Rel:  "self",
+			},
+			{
+				Href: "http://ironic.example.com:6385/nodes/d2630783-6ec8-4836-b556-ab427c4b581e/ports",
+				Rel:  "bookmark",
+			},
+		},
+		PortGroups: []nodes.Link{
+			{
+				Href: "http://ironic.example.com:6385/v1/nodes/d2630783-6ec8-4836-b556-ab427c4b581e/portgroups",
+				Rel:  "self",
+			},
+			{
+				Href: "http://ironic.example.com:6385/nodes/d2630783-6ec8-4836-b556-ab427c4b581e/portgroups",
+				Rel:  "bookmark"},
+		},
+		States: []nodes.Link{
+			{
+				Href: "http://ironic.example.com:6385/v1/nodes/d2630783-6ec8-4836-b556-ab427c4b581e/states",
+				Rel:  "self",
+			},
+		},
 		ResourceClass:       "",
 		BIOSInterface:       "no-bios",
 		BootInterface:       "pxe",
 		ConsoleInterface:    "no-console",
 		DeployInterface:     "iscsi",
-		FirmwareInterface:   "no-firmware",
 		InspectInterface:    "no-inspect",
 		ManagementInterface: "ipmitool",
 		NetworkInterface:    "flat",
@@ -951,14 +985,33 @@ var (
 		StorageInterface:    "noop",
 		Traits:              []string{},
 		VendorInterface:     "ipmitool",
-		ConductorGroup:      "",
-		Protected:           false,
-		ProtectedReason:     "",
-		CreatedAt:           createdAtFoo,
-		UpdatedAt:           updatedAt,
-		ProvisionUpdatedAt:  provisonUpdatedAt,
-		Retired:             false,
-		RetiredReason:       "No longer needed",
+		Volume: []nodes.Link{
+			{
+				Href: "http://ironic.example.com:6385/v1/nodes/d2630783-6ec8-4836-b556-ab427c4b581e/volume",
+				Rel:  "self",
+			},
+		},
+		ConductorGroup:       "",
+		ParentNode:           "",
+		Protected:            false,
+		ProtectedReason:      "",
+		Owner:                "",
+		Lessee:               "",
+		Shard:                "",
+		Description:          "",
+		Conductor:            "",
+		AllocationUUID:       "",
+		Retired:              false,
+		RetiredReason:        "No longer needed",
+		NetworkData:          map[string]interface{}(nil),
+		AutomatedClean:       nil,
+		ServiceStep:          map[string]interface{}(nil),
+		FirmwareInterface:    "no-firmware",
+		ProvisionUpdatedAt:   provisonUpdatedAt,
+		InspectionStartedAt:  nil,
+		InspectionFinishedAt: nil,
+		CreatedAt:            createdAtFoo,
+		UpdatedAt:            updatedAt,
 	}
 
 	NodeFooValidation = nodes.NodeValidation{
@@ -1070,6 +1123,26 @@ var (
 		InspectionFinishedAt: &InspectionFinishedAt,
 		Retired:              false,
 		RetiredReason:        "No longer needed",
+		Links: []nodes.Link{
+			{Href: "http://ironic.example.com:6385/v1/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662", Rel: "self"},
+			{Href: "http://ironic.example.com:6385/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662", Rel: "bookmark"},
+		},
+		Ports: []nodes.Link{
+			{Href: "http://ironic.example.com:6385/v1/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662/ports", Rel: "self"},
+			{Href: "http://ironic.example.com:6385/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662/ports", Rel: "bookmark"},
+		},
+		PortGroups: []nodes.Link{
+			{Href: "http://ironic.example.com:6385/v1/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662/portgroups", Rel: "self"},
+			{Href: "http://ironic.example.com:6385/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662/portgroups", Rel: "bookmark"},
+		},
+		States: []nodes.Link{
+			{Href: "http://ironic.example.com:6385/v1/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662/states", Rel: "self"},
+			{Href: "http://ironic.example.com:6385/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662/states", Rel: "bookmark"},
+		},
+		Volume: []nodes.Link{
+			{Href: "http://ironic.example.com:6385/v1/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662/volume", Rel: "self"},
+			{Href: "http://ironic.example.com:6385/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662/volume", Rel: "bookmark"},
+		},
 	}
 
 	NodeBaz = nodes.Node{
@@ -1119,6 +1192,26 @@ var (
 		UpdatedAt:            updatedAt,
 		Retired:              false,
 		RetiredReason:        "No longer needed",
+		Links: []nodes.Link{
+			{Href: "http://ironic.example.com:6385/v1/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474", Rel: "self"},
+			{Href: "http://ironic.example.com:6385/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474", Rel: "bookmark"},
+		},
+		Ports: []nodes.Link{
+			{Href: "http://ironic.example.com:6385/v1/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474/ports", Rel: "self"},
+			{Href: "http://ironic.example.com:6385/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474/ports", Rel: "bookmark"},
+		},
+		PortGroups: []nodes.Link{
+			{Href: "http://ironic.example.com:6385/v1/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474/portgroups", Rel: "self"},
+			{Href: "http://ironic.example.com:6385/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474/portgroups", Rel: "bookmark"},
+		},
+		States: []nodes.Link{
+			{Href: "http://ironic.example.com:6385/v1/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474/states", Rel: "self"},
+			{Href: "http://ironic.example.com:6385/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474/states", Rel: "bookmark"},
+		},
+		Volume: []nodes.Link{
+			{Href: "http://ironic.example.com:6385/v1/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474/volume", Rel: "self"},
+			{Href: "http://ironic.example.com:6385/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474/volume", Rel: "bookmark"},
+		},
 	}
 
 	ConfigDriveMap = nodes.ConfigDrive{

From 968a33be6bee4f473c0545c74db1f49acfde73de Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Wed, 13 Nov 2024 10:28:17 +0000
Subject: [PATCH 05/32] Add support for disable_power_off

Added in baremetal api v1.95 disable_power_off expcicitly
prevents a node from being powered off by ironic.

See https://specs.openstack.org/openstack/ironic-specs/specs/approved/nc-si.html
---
 openstack/baremetal/v1/nodes/requests.go              | 4 ++++
 openstack/baremetal/v1/nodes/results.go               | 4 ++++
 openstack/baremetal/v1/nodes/testing/fixtures_test.go | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/openstack/baremetal/v1/nodes/requests.go b/openstack/baremetal/v1/nodes/requests.go
index 8cb0de9e05..8b2eb4b218 100644
--- a/openstack/baremetal/v1/nodes/requests.go
+++ b/openstack/baremetal/v1/nodes/requests.go
@@ -274,6 +274,10 @@ type CreateOpts struct {
 
 	// Static network configuration to use during deployment and cleaning.
 	NetworkData map[string]any `json:"network_data,omitempty"`
+
+	// Whether disable_power_off is enabled or disabled on this node.
+	// Requires microversion 1.95 or later.
+	DisablePowerOff *bool `json:"disable_power_off,omitempty"`
 }
 
 // ToNodeCreateMap assembles a request body based on the contents of a CreateOpts.
diff --git a/openstack/baremetal/v1/nodes/results.go b/openstack/baremetal/v1/nodes/results.go
index 22babe02d3..507e0d6a4f 100644
--- a/openstack/baremetal/v1/nodes/results.go
+++ b/openstack/baremetal/v1/nodes/results.go
@@ -314,6 +314,10 @@ type Node struct {
 
 	// The UTC date and time when the resource was updated, ISO 8601 format. May be “null”.
 	UpdatedAt time.Time `json:"updated_at"`
+
+	// Whether disable_power_off is enabled or disabled on this node.
+	// Requires microversion 1.95 or later.
+	DisablePowerOff bool `json:"disable_power_off"`
 }
 
 // NodePage abstracts the raw results of making a List() request against
diff --git a/openstack/baremetal/v1/nodes/testing/fixtures_test.go b/openstack/baremetal/v1/nodes/testing/fixtures_test.go
index d174edde2b..7819111314 100644
--- a/openstack/baremetal/v1/nodes/testing/fixtures_test.go
+++ b/openstack/baremetal/v1/nodes/testing/fixtures_test.go
@@ -87,6 +87,7 @@ const NodeListDetailBody = `
       "created_at": "2019-01-31T19:59:28+00:00",
       "deploy_interface": "iscsi",
       "deploy_step": {},
+      "disable_power_off": false,
       "driver": "ipmi",
       "driver_info": {
         "ipmi_port": "6230",
@@ -195,6 +196,7 @@ const NodeListDetailBody = `
       "created_at": "2019-01-31T19:59:29+00:00",
       "deploy_interface": "iscsi",
       "deploy_step": {},
+      "disable_power_off": false,
       "driver": "ipmi",
       "driver_info": {},
       "driver_internal_info": {},
@@ -295,6 +297,7 @@ const NodeListDetailBody = `
       "created_at": "2019-01-31T19:59:30+00:00",
       "deploy_interface": "iscsi",
       "deploy_step": {},
+      "disable_power_off": true,
       "driver": "ipmi",
       "driver_info": {},
       "driver_internal_info": {},
@@ -1123,6 +1126,7 @@ var (
 		InspectionFinishedAt: &InspectionFinishedAt,
 		Retired:              false,
 		RetiredReason:        "No longer needed",
+		DisablePowerOff:      false,
 		Links: []nodes.Link{
 			{Href: "http://ironic.example.com:6385/v1/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662", Rel: "self"},
 			{Href: "http://ironic.example.com:6385/nodes/08c84581-58f5-4ea2-a0c6-dd2e5d2b3662", Rel: "bookmark"},
@@ -1192,6 +1196,7 @@ var (
 		UpdatedAt:            updatedAt,
 		Retired:              false,
 		RetiredReason:        "No longer needed",
+		DisablePowerOff:      true,
 		Links: []nodes.Link{
 			{Href: "http://ironic.example.com:6385/v1/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474", Rel: "self"},
 			{Href: "http://ironic.example.com:6385/nodes/c9afd385-5d89-4ecb-9e1c-68194da6b474", Rel: "bookmark"},

From c5b4c8db118715050161bc014ad1c1e1f0325510 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 09:11:02 +0000
Subject: [PATCH 06/32] build(deps): bump golang.org/x/crypto from 0.25.0 to
 0.26.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.25.0 to 0.26.0.
- [Commits](https://github.com/golang/crypto/compare/v0.25.0...v0.26.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod |  4 ++--
 go.sum | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index d4ac50a838..1a02e360ff 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/gophercloud/gophercloud/v2
 go 1.22
 
 require (
-	golang.org/x/crypto v0.25.0
+	golang.org/x/crypto v0.26.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-require golang.org/x/sys v0.22.0 // indirect
+require golang.org/x/sys v0.23.0 // indirect
diff --git a/go.sum b/go.sum
index 1e1f48a722..70de9bd3f3 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
-golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
+golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
+golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
+golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
+golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

From b7f6fc436624a37eb2a245907b174892d97dcb07 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Thu, 28 Nov 2024 17:58:30 +0000
Subject: [PATCH 07/32] Drop CI coverage for Antelope

Antelope has entered the unmaintained [1] phase. We can no longer rely
on this for testing.

[1] https://docs.openstack.org/project-team-guide/stable-branches.html#unmaintained

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 .github/workflows/functional-baremetal.yaml         | 5 -----
 .github/workflows/functional-basic.yaml             | 4 ----
 .github/workflows/functional-blockstorage.yaml      | 4 ----
 .github/workflows/functional-compute.yaml           | 4 ----
 .github/workflows/functional-containerinfra.yaml    | 7 -------
 .github/workflows/functional-dns.yaml               | 4 ----
 .github/workflows/functional-fwaas_v2.yaml          | 4 ----
 .github/workflows/functional-identity.yaml          | 4 ----
 .github/workflows/functional-image.yaml             | 4 ----
 .github/workflows/functional-keymanager.yaml        | 4 ----
 .github/workflows/functional-loadbalancer.yaml      | 4 ----
 .github/workflows/functional-messaging.yaml         | 4 ----
 .github/workflows/functional-networking.yaml        | 4 ----
 .github/workflows/functional-objectstorage.yaml     | 4 ----
 .github/workflows/functional-orchestration.yaml     | 4 ----
 .github/workflows/functional-placement.yaml         | 4 ----
 .github/workflows/functional-sharedfilesystems.yaml | 4 ----
 17 files changed, 72 deletions(-)

diff --git a/.github/workflows/functional-baremetal.yaml b/.github/workflows/functional-baremetal.yaml
index c4aa44d8f5..adfb726385 100644
--- a/.github/workflows/functional-baremetal.yaml
+++ b/.github/workflows/functional-baremetal.yaml
@@ -29,11 +29,6 @@ jobs:
             ubuntu_version: "22.04"
             use_system_scope: false
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            use_system_scope: false
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Ironic and run baremetal acceptance tests
     steps:
diff --git a/.github/workflows/functional-basic.yaml b/.github/workflows/functional-basic.yaml
index 8157156702..0cad444eac 100644
--- a/.github/workflows/functional-basic.yaml
+++ b/.github/workflows/functional-basic.yaml
@@ -26,10 +26,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with defaults and run basic acceptance tests
     steps:
diff --git a/.github/workflows/functional-blockstorage.yaml b/.github/workflows/functional-blockstorage.yaml
index dceb7596a3..df08b64f9d 100644
--- a/.github/workflows/functional-blockstorage.yaml
+++ b/.github/workflows/functional-blockstorage.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Cinder and run blockstorage acceptance tests
     steps:
diff --git a/.github/workflows/functional-compute.yaml b/.github/workflows/functional-compute.yaml
index 0e1bab61e9..6600138f96 100644
--- a/.github/workflows/functional-compute.yaml
+++ b/.github/workflows/functional-compute.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Nova and run compute acceptance tests
     steps:
diff --git a/.github/workflows/functional-containerinfra.yaml b/.github/workflows/functional-containerinfra.yaml
index df45bae93e..e4f6d71444 100644
--- a/.github/workflows/functional-containerinfra.yaml
+++ b/.github/workflows/functional-containerinfra.yaml
@@ -32,13 +32,6 @@ jobs:
               enable_plugin magnum https://github.com/openstack/magnum stable/2023.2
               MAGNUMCLIENT_BRANCH=stable/2023.2
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            devstack_conf_overrides: |
-              enable_plugin magnum https://github.com/openstack/magnum stable/2023.1
-              MAGNUMCLIENT_BRANCH=stable/2023.1
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Magnum and run containerinfra acceptance tests
     steps:
diff --git a/.github/workflows/functional-dns.yaml b/.github/workflows/functional-dns.yaml
index a20d5c1f85..ffeac43918 100644
--- a/.github/workflows/functional-dns.yaml
+++ b/.github/workflows/functional-dns.yaml
@@ -24,10 +24,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Designate and run dns acceptance tests
     steps:
diff --git a/.github/workflows/functional-fwaas_v2.yaml b/.github/workflows/functional-fwaas_v2.yaml
index 09d03db28b..53a94d76c2 100644
--- a/.github/workflows/functional-fwaas_v2.yaml
+++ b/.github/workflows/functional-fwaas_v2.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with enabled FWaaS_v2 and run networking acceptance tests
     steps:
diff --git a/.github/workflows/functional-identity.yaml b/.github/workflows/functional-identity.yaml
index f6f083bc62..1b11132609 100644
--- a/.github/workflows/functional-identity.yaml
+++ b/.github/workflows/functional-identity.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Keystone and run identity acceptance tests
     steps:
diff --git a/.github/workflows/functional-image.yaml b/.github/workflows/functional-image.yaml
index 554c89fcc3..0d9855d5f1 100644
--- a/.github/workflows/functional-image.yaml
+++ b/.github/workflows/functional-image.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Glance and run image acceptance tests
     steps:
diff --git a/.github/workflows/functional-keymanager.yaml b/.github/workflows/functional-keymanager.yaml
index 9cdd3cbdf1..979227ae92 100644
--- a/.github/workflows/functional-keymanager.yaml
+++ b/.github/workflows/functional-keymanager.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Barbican and run keymanager acceptance tests
     steps:
diff --git a/.github/workflows/functional-loadbalancer.yaml b/.github/workflows/functional-loadbalancer.yaml
index c40e8ee2c4..7a91c91e71 100644
--- a/.github/workflows/functional-loadbalancer.yaml
+++ b/.github/workflows/functional-loadbalancer.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Octavia and run loadbalancer acceptance tests
     steps:
diff --git a/.github/workflows/functional-messaging.yaml b/.github/workflows/functional-messaging.yaml
index db990e0d81..98fe43d421 100644
--- a/.github/workflows/functional-messaging.yaml
+++ b/.github/workflows/functional-messaging.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Zaqar and run messaging acceptance tests
     steps:
diff --git a/.github/workflows/functional-networking.yaml b/.github/workflows/functional-networking.yaml
index 480a493d88..fba964795a 100644
--- a/.github/workflows/functional-networking.yaml
+++ b/.github/workflows/functional-networking.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Neutron and run networking acceptance tests
     steps:
diff --git a/.github/workflows/functional-objectstorage.yaml b/.github/workflows/functional-objectstorage.yaml
index c0b204a1b4..54e9b52bf2 100644
--- a/.github/workflows/functional-objectstorage.yaml
+++ b/.github/workflows/functional-objectstorage.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Swift and run objectstorage acceptance tests
     steps:
diff --git a/.github/workflows/functional-orchestration.yaml b/.github/workflows/functional-orchestration.yaml
index 0f627474b5..1423d8f9af 100644
--- a/.github/workflows/functional-orchestration.yaml
+++ b/.github/workflows/functional-orchestration.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Heat and run orchestration acceptance tests
     steps:
diff --git a/.github/workflows/functional-placement.yaml b/.github/workflows/functional-placement.yaml
index 640df2c1d5..d138a53175 100644
--- a/.github/workflows/functional-placement.yaml
+++ b/.github/workflows/functional-placement.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Placement and run placement acceptance tests
     steps:
diff --git a/.github/workflows/functional-sharedfilesystems.yaml b/.github/workflows/functional-sharedfilesystems.yaml
index e4d8bbea39..c799250d7e 100644
--- a/.github/workflows/functional-sharedfilesystems.yaml
+++ b/.github/workflows/functional-sharedfilesystems.yaml
@@ -23,10 +23,6 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
             additional_services: ""
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} with Manila and run sharedfilesystems acceptance tests
     steps:

From d1b8a2413710b4ee40c78e979a846744923f22eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2024 09:58:44 +0000
Subject: [PATCH 08/32] build(deps): bump golang.org/x/crypto from 0.26.0 to
 0.27.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.26.0 to 0.27.0.
- [Commits](https://github.com/golang/crypto/compare/v0.26.0...v0.27.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod |  4 ++--
 go.sum | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 1a02e360ff..0f39082357 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/gophercloud/gophercloud/v2
 go 1.22
 
 require (
-	golang.org/x/crypto v0.26.0
+	golang.org/x/crypto v0.27.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-require golang.org/x/sys v0.23.0 // indirect
+require golang.org/x/sys v0.25.0 // indirect
diff --git a/go.sum b/go.sum
index 70de9bd3f3..77cbe99406 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
-golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
-golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
-golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

From 5e4e1e30759e0eaeefab92e366f5ce87f9a24ea7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 09:49:00 +0000
Subject: [PATCH 09/32] build(deps): bump golang.org/x/crypto from 0.27.0 to
 0.28.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.27.0 to 0.28.0.
- [Commits](https://github.com/golang/crypto/compare/v0.27.0...v0.28.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod |  4 ++--
 go.sum | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 0f39082357..8e527ec8e5 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/gophercloud/gophercloud/v2
 go 1.22
 
 require (
-	golang.org/x/crypto v0.27.0
+	golang.org/x/crypto v0.28.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-require golang.org/x/sys v0.25.0 // indirect
+require golang.org/x/sys v0.26.0 // indirect
diff --git a/go.sum b/go.sum
index 77cbe99406..7cc4cf43b5 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
-golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

From e5d9366136beb69d20a0f1c0dd4d2e0b2994051e Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Fri, 29 Nov 2024 11:13:38 +0000
Subject: [PATCH 10/32] make: Switch default test runner

gotestsum provides far more readable output than the default runner.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 Makefile | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 128beec005..2a7a9376d9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 undefine GOFLAGS
 
 GOLANGCI_LINT_VERSION?=v1.57.1
+GO_TEST?=go run gotest.tools/gotestsum@latest --format testname
 
 ifeq ($(shell command -v podman 2> /dev/null),)
 	RUNNER=docker
@@ -26,84 +27,84 @@ lint:
 .PHONY: lint
 
 unit:
-	go test ./...
+	$(GO_TEST) ./...
 .PHONY: unit
 
 coverage:
-	go test -covermode count -coverprofile cover.out -coverpkg=./... ./...
+	$(GO_TEST) -covermode count -coverprofile cover.out -coverpkg=./... ./...
 .PHONY: coverage
 
 acceptance: acceptance-baremetal acceptance-blockstorage acceptance-compute acceptance-container acceptance-containerinfra acceptance-db acceptance-dns acceptance-identity acceptance-imageservice acceptance-keymanager acceptance-loadbalancer acceptance-messaging acceptance-networking acceptance-objectstorage acceptance-orchestration acceptance-placement acceptance-sharedfilesystems acceptance-workflow
 .PHONY: acceptance
 
 acceptance-baremetal:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/baremetal/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/baremetal/...
 .PHONY: acceptance-baremetal
 
 acceptance-blockstorage:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/blockstorage/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/blockstorage/...
 .PHONY: acceptance-blockstorage
 
 acceptance-compute:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/compute/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/compute/...
 .PHONY: acceptance-compute
 
 acceptance-container:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/container/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/container/...
 .PHONY: acceptance-container
 
 acceptance-containerinfra:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/containerinfra/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/containerinfra/...
 .PHONY: acceptance-containerinfra
 
 acceptance-db:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/db/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/db/...
 .PHONY: acceptance-db
 
 acceptance-dns:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/dns/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/dns/...
 .PHONY: acceptance-dns
 
 acceptance-identity:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/identity/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/identity/...
 .PHONY: acceptance-identity
 
 acceptance-image:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/imageservice/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/imageservice/...
 .PHONY: acceptance-image
 
 acceptance-keymanager:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/keymanager/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/keymanager/...
 .PHONY: acceptance-keymanager
 
 acceptance-loadbalancer:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/loadbalancer/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/loadbalancer/...
 .PHONY: acceptance-loadbalancer
 
 acceptance-messaging:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/messaging/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/messaging/...
 .PHONY: acceptance-messaging
 
 acceptance-networking:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/networking/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/networking/...
 .PHONY: acceptance-networking
 
 acceptance-objectstorage:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/objectstorage/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/objectstorage/...
 .PHONY: acceptance-objectstorage
 
 acceptance-orchestration:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/orchestration/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/orchestration/...
 .PHONY: acceptance-orchestration
 
 acceptance-placement:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/placement/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/placement/...
 .PHONY: acceptance-placement
 
 acceptance-sharedfilesystems:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/sharedfilesystems/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/sharedfilesystems/...
 .PHONY: acceptance-sharefilesystems
 
 acceptance-workflow:
-	go test -tags "fixtures acceptance" ./internal/acceptance/openstack/workflow/...
+	$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/workflow/...
 .PHONY: acceptance-workflow

From 97705e979536f57c911fac3a6234489bbb7c157e Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sat, 16 Nov 2024 21:19:52 +0100
Subject: [PATCH 11/32] Adding CI job for testing workflow (Mistral)

---
 .github/workflows/functional-workflow.yaml | 67 ++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 .github/workflows/functional-workflow.yaml

diff --git a/.github/workflows/functional-workflow.yaml b/.github/workflows/functional-workflow.yaml
new file mode 100644
index 0000000000..f124fc6412
--- /dev/null
+++ b/.github/workflows/functional-workflow.yaml
@@ -0,0 +1,67 @@
+name: functional-workflow
+on:
+  pull_request:
+    paths:
+      - '**workflow**'
+  schedule:
+    - cron: '0 0 */3 * *'
+jobs:
+  functional-workflow:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: "master"
+            openstack_version: "master"
+            ubuntu_version: "22.04"
+            mistral_plugin_version: "master"
+            additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            mistral_plugin_version: "stable/2024.2"
+            additional_services: "openstack-cli-server"
+          - name: "caracal"
+            openstack_version: "stable/2024.1"
+            ubuntu_version: "22.04"
+            mistral_plugin_version: "stable/2024.1"
+            additional_services: ""
+          - name: "bobcat"
+            openstack_version: "stable/2023.2"
+            ubuntu_version: "22.04"
+            # Devstack support is broken with Mistral v2023.2, and requires 2 patches:
+            # * https://github.com/openstack/mistral/commit/e343ccb078d8ba261ac70afca93f4358589730d3
+            # * https://github.com/openstack/mistral/commit/ecdeadeb7a1aa87cba2cdb0c1a2bb1ffc4aabf25
+            mistral_plugin_version: "ecdeadeb7a1aa87cba2cdb0c1a2bb1ffc4aabf25"
+            additional_services: ""
+    runs-on: ubuntu-${{ matrix.ubuntu_version }}
+    name: Deploy OpenStack ${{ matrix.name }} with Mistral and run workflow acceptance tests
+    steps:
+      - name: Checkout Gophercloud
+        uses: actions/checkout@v4
+      - name: Deploy devstack
+        uses: EmilienM/devstack-action@e82a9cbead099cba72f99537e82a360c3e319c69
+        with:
+          branch: ${{ matrix.openstack_version }}
+          conf_overrides: |
+            enable_plugin mistral https://github.com/openstack/mistral ${{ matrix.mistral_plugin_version }}
+          enabled_services: "mistral,mistral-api,mistral-engine,mistral-executor,mistral-event-engine,${{ matrix.additional_services }}"
+      - name: Checkout go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '^1.22'
+      - name: Run Gophercloud acceptance tests
+        run: ./script/acceptancetest
+        env:
+          DEVSTACK_PATH: ${{ github.workspace }}/devstack
+          PACKAGE: "./internal/acceptance/openstack/workflow/..."
+          OS_BRANCH: ${{ matrix.openstack_version }}
+      - name: Generate logs on failure
+        run: ./script/collectlogs
+        if: failure()
+      - name: Upload logs artifacts on failure
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: functional-workflow-${{ matrix.name }}-${{ github.run_id }}
+          path: /tmp/devstack-logs/*

From 391057892a7e50e03801278658d15e53cb84ae6b Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 26 Sep 2024 11:57:07 -0400
Subject: [PATCH 12/32] Merge pull request #3187 from
 shiftstack/label-needs-tests

Add label: just-needs-tests
---
 .github/labels.yaml                                 | 3 +++
 .github/workflows/functional-baremetal.yaml         | 5 +++++
 .github/workflows/functional-basic.yaml             | 4 ++++
 .github/workflows/functional-blockstorage.yaml      | 4 ++++
 .github/workflows/functional-compute.yaml           | 4 ++++
 .github/workflows/functional-containerinfra.yaml    | 7 +++++++
 .github/workflows/functional-dns.yaml               | 4 ++++
 .github/workflows/functional-fwaas_v2.yaml          | 4 ++++
 .github/workflows/functional-identity.yaml          | 4 ++++
 .github/workflows/functional-image.yaml             | 4 ++++
 .github/workflows/functional-keymanager.yaml        | 4 ++++
 .github/workflows/functional-loadbalancer.yaml      | 4 ++++
 .github/workflows/functional-messaging.yaml         | 4 ++++
 .github/workflows/functional-networking.yaml        | 4 ++++
 .github/workflows/functional-objectstorage.yaml     | 4 ++++
 .github/workflows/functional-orchestration.yaml     | 4 ++++
 .github/workflows/functional-placement.yaml         | 4 ++++
 .github/workflows/functional-sharedfilesystems.yaml | 4 ++++
 18 files changed, 75 insertions(+)

diff --git a/.github/labels.yaml b/.github/labels.yaml
index 4f888b4d4f..ad21863831 100644
--- a/.github/labels.yaml
+++ b/.github/labels.yaml
@@ -22,6 +22,9 @@
 - color: 'F9D0C4'
   description: Additional information requested
   name: needinfo
+- color: 'FEF2C0'
+  description: This PR lacks tests before it can be merged
+  name: just-needs-tests
 
 - color: '30ABB9'
   description: This PR targets v1
diff --git a/.github/workflows/functional-baremetal.yaml b/.github/workflows/functional-baremetal.yaml
index adfb726385..e9ccef16ec 100644
--- a/.github/workflows/functional-baremetal.yaml
+++ b/.github/workflows/functional-baremetal.yaml
@@ -14,6 +14,11 @@ jobs:
           - name: "master"
             openstack_version: "master"
             ubuntu_version: "22.04"
+            use_system_scope: true
+            additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
             # NOTE(dtantsur): this forces running tests with a system scope
             # token, which is required for certain actions. Use it on versions
             # starting with 2024.1.
diff --git a/.github/workflows/functional-basic.yaml b/.github/workflows/functional-basic.yaml
index 0cad444eac..718e4eba57 100644
--- a/.github/workflows/functional-basic.yaml
+++ b/.github/workflows/functional-basic.yaml
@@ -18,6 +18,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-blockstorage.yaml b/.github/workflows/functional-blockstorage.yaml
index df08b64f9d..68e5832e39 100644
--- a/.github/workflows/functional-blockstorage.yaml
+++ b/.github/workflows/functional-blockstorage.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-compute.yaml b/.github/workflows/functional-compute.yaml
index 6600138f96..2db1173327 100644
--- a/.github/workflows/functional-compute.yaml
+++ b/.github/workflows/functional-compute.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-containerinfra.yaml b/.github/workflows/functional-containerinfra.yaml
index e4f6d71444..0cbb4b47da 100644
--- a/.github/workflows/functional-containerinfra.yaml
+++ b/.github/workflows/functional-containerinfra.yaml
@@ -18,6 +18,13 @@ jobs:
               enable_plugin magnum https://github.com/openstack/magnum master
               MAGNUMCLIENT_BRANCH=master
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            devstack_conf_overrides: |
+              enable_plugin magnum https://github.com/openstack/magnum stable/2024.2
+              MAGNUMCLIENT_BRANCH=stable/2024.2
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-dns.yaml b/.github/workflows/functional-dns.yaml
index ffeac43918..8fb1b24f9d 100644
--- a/.github/workflows/functional-dns.yaml
+++ b/.github/workflows/functional-dns.yaml
@@ -16,6 +16,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-fwaas_v2.yaml b/.github/workflows/functional-fwaas_v2.yaml
index 53a94d76c2..b741554451 100644
--- a/.github/workflows/functional-fwaas_v2.yaml
+++ b/.github/workflows/functional-fwaas_v2.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-identity.yaml b/.github/workflows/functional-identity.yaml
index 1b11132609..e2ff7284ca 100644
--- a/.github/workflows/functional-identity.yaml
+++ b/.github/workflows/functional-identity.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-image.yaml b/.github/workflows/functional-image.yaml
index 0d9855d5f1..410384cad7 100644
--- a/.github/workflows/functional-image.yaml
+++ b/.github/workflows/functional-image.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-keymanager.yaml b/.github/workflows/functional-keymanager.yaml
index 979227ae92..06ddd57d3b 100644
--- a/.github/workflows/functional-keymanager.yaml
+++ b/.github/workflows/functional-keymanager.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-loadbalancer.yaml b/.github/workflows/functional-loadbalancer.yaml
index 7a91c91e71..77a637375a 100644
--- a/.github/workflows/functional-loadbalancer.yaml
+++ b/.github/workflows/functional-loadbalancer.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-messaging.yaml b/.github/workflows/functional-messaging.yaml
index 98fe43d421..8576e41a0d 100644
--- a/.github/workflows/functional-messaging.yaml
+++ b/.github/workflows/functional-messaging.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-networking.yaml b/.github/workflows/functional-networking.yaml
index fba964795a..cba8fb2cc4 100644
--- a/.github/workflows/functional-networking.yaml
+++ b/.github/workflows/functional-networking.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-objectstorage.yaml b/.github/workflows/functional-objectstorage.yaml
index 54e9b52bf2..f2d4a2d58c 100644
--- a/.github/workflows/functional-objectstorage.yaml
+++ b/.github/workflows/functional-objectstorage.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-orchestration.yaml b/.github/workflows/functional-orchestration.yaml
index 1423d8f9af..fefc9b550e 100644
--- a/.github/workflows/functional-orchestration.yaml
+++ b/.github/workflows/functional-orchestration.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-placement.yaml b/.github/workflows/functional-placement.yaml
index d138a53175..d8b31f2ad8 100644
--- a/.github/workflows/functional-placement.yaml
+++ b/.github/workflows/functional-placement.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
diff --git a/.github/workflows/functional-sharedfilesystems.yaml b/.github/workflows/functional-sharedfilesystems.yaml
index c799250d7e..cca13e788c 100644
--- a/.github/workflows/functional-sharedfilesystems.yaml
+++ b/.github/workflows/functional-sharedfilesystems.yaml
@@ -15,6 +15,10 @@ jobs:
             openstack_version: "master"
             ubuntu_version: "22.04"
             additional_services: "openstack-cli-server"
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"

From 9e952bb9cc3e8a5cc3fd6cf32ffc7a78a700cc52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Wed, 11 Sep 2024 17:16:00 +0200
Subject: [PATCH 13/32] migration.md: exclude vendor directory for automated
 script

---
 docs/MIGRATING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/MIGRATING.md b/docs/MIGRATING.md
index c398cf0e65..75c4724a95 100644
--- a/docs/MIGRATING.md
+++ b/docs/MIGRATING.md
@@ -519,7 +519,7 @@ blockstorageversion=v3
 
 openstack='github.com/gophercloud/gophercloud/openstack'
 openstack_utils='github.com/gophercloud/utils/openstack'
-find . -type f -name '*.go' -exec sed -i '
+find . -type f -name '*.go' -not -path "*/vendor/*" -exec sed -i '
     /^import ($/,/^)$/ {
 
         # 1: These packages have been removed and their functionality moved into the main module for the corresponding service.

From f6b7b21db3e7cc578df5b1fc5ded9a8ab09b76a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Wed, 11 Sep 2024 17:18:03 +0200
Subject: [PATCH 14/32] migration.md: try converting more error types

We should try converting all ErrDefaultXXX errors that existed in
gophercloud v1 to their net/http equivalent.
---
 docs/MIGRATING.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/MIGRATING.md b/docs/MIGRATING.md
index 75c4724a95..7bf4ed9708 100644
--- a/docs/MIGRATING.md
+++ b/docs/MIGRATING.md
@@ -611,8 +611,19 @@ find . -type f -name '*.go' -not -path "*/vendor/*" -exec sed -i '
         # 8: Rename identifiers that were changed in v2
         s#\(\(volumes\|servers\)\.SchedulerHint\)s#\2.SchedulerHintOpts#g
 
-        # 9: Tentatively replace error handling for 404s
+        # 9: Tentatively replace error handling
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault400); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusBadRequest) {#g
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault401); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusUnauthorized) {#g
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault403); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusForbidden) {#g
         s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault404); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusNotFound) {#g
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault405); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusMethodNotAllowed) {#g
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault408); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusRequestTimeout) {#g
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault409); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusConflict) {#g
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault429); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusTooManyRequests) {#g
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault500); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusInternalServerError) {#g
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault502); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusBadGateway) {#g
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault503); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusServiceUnavailable) {#g
+        s#\(\t\+\)if _, ok := err.(gophercloud.ErrDefault504); \(!\?\)ok {#\1if \2gophercloud.ResponseCodeIs(err, http.StatusGatewayTimeout) {#g
     }
     ' {} \;
 

From 1a2d7e559323c3242ce109a930da47af2904cf1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 09:21:06 +0000
Subject: [PATCH 15/32] build(deps): bump golang.org/x/crypto from 0.28.0 to
 0.29.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.28.0 to 0.29.0.
- [Commits](https://github.com/golang/crypto/compare/v0.28.0...v0.29.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod |  4 ++--
 go.sum | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 8e527ec8e5..45961985de 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/gophercloud/gophercloud/v2
 go 1.22
 
 require (
-	golang.org/x/crypto v0.28.0
+	golang.org/x/crypto v0.29.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-require golang.org/x/sys v0.26.0 // indirect
+require golang.org/x/sys v0.27.0 // indirect
diff --git a/go.sum b/go.sum
index 7cc4cf43b5..a14f597436 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
-golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
+golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
+golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=
+golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

From 066e8d7a567b2b974041d7a75894d939dc62b5dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:00:56 +0000
Subject: [PATCH 16/32] build(deps): bump golang.org/x/crypto from 0.29.0 to
 0.30.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.29.0 to 0.30.0.
- [Commits](https://github.com/golang/crypto/compare/v0.29.0...v0.30.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod |  4 ++--
 go.sum | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 45961985de..dc5d92e323 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/gophercloud/gophercloud/v2
 go 1.22
 
 require (
-	golang.org/x/crypto v0.29.0
+	golang.org/x/crypto v0.30.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-require golang.org/x/sys v0.27.0 // indirect
+require golang.org/x/sys v0.28.0 // indirect
diff --git a/go.sum b/go.sum
index a14f597436..1812f7828d 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=
-golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
+golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
+golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

From 301d0bdc62ffd4601edb396ccba6c3e9e7fe2010 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Tue, 16 Jul 2024 14:49:49 +0100
Subject: [PATCH 17/32] CI: Append job ID to artifact name

Otherwise you end up with lots of duplicate
'functional-{service}-{branch}' tarballs when debugging.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 .github/workflows/functional-baremetal.yaml         | 2 +-
 .github/workflows/functional-basic.yaml             | 2 +-
 .github/workflows/functional-blockstorage.yaml      | 2 +-
 .github/workflows/functional-compute.yaml           | 2 +-
 .github/workflows/functional-containerinfra.yaml    | 2 +-
 .github/workflows/functional-dns.yaml               | 2 +-
 .github/workflows/functional-fwaas_v2.yaml          | 2 +-
 .github/workflows/functional-identity.yaml          | 2 +-
 .github/workflows/functional-image.yaml             | 2 +-
 .github/workflows/functional-keymanager.yaml        | 2 +-
 .github/workflows/functional-loadbalancer.yaml      | 2 +-
 .github/workflows/functional-messaging.yaml         | 2 +-
 .github/workflows/functional-networking.yaml        | 2 +-
 .github/workflows/functional-objectstorage.yaml     | 2 +-
 .github/workflows/functional-orchestration.yaml     | 2 +-
 .github/workflows/functional-placement.yaml         | 2 +-
 .github/workflows/functional-sharedfilesystems.yaml | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/functional-baremetal.yaml b/.github/workflows/functional-baremetal.yaml
index adfb726385..ac51bf0a82 100644
--- a/.github/workflows/functional-baremetal.yaml
+++ b/.github/workflows/functional-baremetal.yaml
@@ -102,5 +102,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-baremetal-${{ matrix.name }}
+          name: functional-baremetal-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-basic.yaml b/.github/workflows/functional-basic.yaml
index 0cad444eac..91fa29ad65 100644
--- a/.github/workflows/functional-basic.yaml
+++ b/.github/workflows/functional-basic.yaml
@@ -53,5 +53,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-basic-${{ matrix.name }}
+          name: functional-basic-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-blockstorage.yaml b/.github/workflows/functional-blockstorage.yaml
index df08b64f9d..9ef59a7e41 100644
--- a/.github/workflows/functional-blockstorage.yaml
+++ b/.github/workflows/functional-blockstorage.yaml
@@ -52,5 +52,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-blockstorage-${{ matrix.name }}
+          name: functional-blockstorage-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-compute.yaml b/.github/workflows/functional-compute.yaml
index 6600138f96..f55363f3c1 100644
--- a/.github/workflows/functional-compute.yaml
+++ b/.github/workflows/functional-compute.yaml
@@ -52,5 +52,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-compute-${{ matrix.name }}
+          name: functional-compute-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-containerinfra.yaml b/.github/workflows/functional-containerinfra.yaml
index e4f6d71444..d13cbac8dc 100644
--- a/.github/workflows/functional-containerinfra.yaml
+++ b/.github/workflows/functional-containerinfra.yaml
@@ -66,5 +66,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-containerinfra-${{ matrix.name }}
+          name: functional-containerinfra-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-dns.yaml b/.github/workflows/functional-dns.yaml
index ffeac43918..0650723b4b 100644
--- a/.github/workflows/functional-dns.yaml
+++ b/.github/workflows/functional-dns.yaml
@@ -53,5 +53,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-dns-${{ matrix.name }}
+          name: functional-dns-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-fwaas_v2.yaml b/.github/workflows/functional-fwaas_v2.yaml
index 53a94d76c2..cebce8e0af 100644
--- a/.github/workflows/functional-fwaas_v2.yaml
+++ b/.github/workflows/functional-fwaas_v2.yaml
@@ -57,5 +57,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-fwaas_v2-${{ matrix.name }}
+          name: functional-fwaas_v2-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-identity.yaml b/.github/workflows/functional-identity.yaml
index 1b11132609..5d15245912 100644
--- a/.github/workflows/functional-identity.yaml
+++ b/.github/workflows/functional-identity.yaml
@@ -50,5 +50,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-identity-${{ matrix.name }}
+          name: functional-identity-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-image.yaml b/.github/workflows/functional-image.yaml
index 0d9855d5f1..606b756d1c 100644
--- a/.github/workflows/functional-image.yaml
+++ b/.github/workflows/functional-image.yaml
@@ -50,5 +50,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-image-${{ matrix.name }}
+          name: functional-image-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-keymanager.yaml b/.github/workflows/functional-keymanager.yaml
index 979227ae92..4af4af43f2 100644
--- a/.github/workflows/functional-keymanager.yaml
+++ b/.github/workflows/functional-keymanager.yaml
@@ -52,5 +52,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-keymanager-${{ matrix.name }}
+          name: functional-keymanager-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-loadbalancer.yaml b/.github/workflows/functional-loadbalancer.yaml
index 7a91c91e71..3ce2c21e09 100644
--- a/.github/workflows/functional-loadbalancer.yaml
+++ b/.github/workflows/functional-loadbalancer.yaml
@@ -53,5 +53,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-loadbalancer-${{ matrix.name }}
+          name: functional-loadbalancer-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-messaging.yaml b/.github/workflows/functional-messaging.yaml
index 98fe43d421..fa1dedb63f 100644
--- a/.github/workflows/functional-messaging.yaml
+++ b/.github/workflows/functional-messaging.yaml
@@ -53,5 +53,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-messaging-${{ matrix.name }}
+          name: functional-messaging-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-networking.yaml b/.github/workflows/functional-networking.yaml
index fba964795a..e8526c7a9d 100644
--- a/.github/workflows/functional-networking.yaml
+++ b/.github/workflows/functional-networking.yaml
@@ -67,5 +67,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-networking-${{ matrix.name }}
+          name: functional-networking-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-objectstorage.yaml b/.github/workflows/functional-objectstorage.yaml
index 54e9b52bf2..abd5738697 100644
--- a/.github/workflows/functional-objectstorage.yaml
+++ b/.github/workflows/functional-objectstorage.yaml
@@ -56,5 +56,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-objectstorage-${{ matrix.name }}
+          name: functional-objectstorage-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-orchestration.yaml b/.github/workflows/functional-orchestration.yaml
index 1423d8f9af..a02f435cd2 100644
--- a/.github/workflows/functional-orchestration.yaml
+++ b/.github/workflows/functional-orchestration.yaml
@@ -52,5 +52,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-orchestration-${{ matrix.name }}
+          name: functional-orchestration-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-placement.yaml b/.github/workflows/functional-placement.yaml
index d138a53175..4cca481f7d 100644
--- a/.github/workflows/functional-placement.yaml
+++ b/.github/workflows/functional-placement.yaml
@@ -50,5 +50,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-placement-${{ matrix.name }}
+          name: functional-placement-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/functional-sharedfilesystems.yaml b/.github/workflows/functional-sharedfilesystems.yaml
index c799250d7e..93822175a7 100644
--- a/.github/workflows/functional-sharedfilesystems.yaml
+++ b/.github/workflows/functional-sharedfilesystems.yaml
@@ -66,5 +66,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: functional-sharedfilesystems-${{ matrix.name }}
+          name: functional-sharedfilesystems-${{ matrix.name }}-${{ github.run_id }}
           path: /tmp/devstack-logs/*

From c09920f72767a08566c203d709d35ea8cad41058 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Wed, 29 May 2024 14:46:10 +0100
Subject: [PATCH 18/32] make: Add 'format' target

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 2a7a9376d9..066946cf8d 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,10 @@ lint:
 		golangci/golangci-lint:$(GOLANGCI_LINT_VERSION) golangci-lint run
 .PHONY: lint
 
+format:
+	gofmt -w -s $(shell pwd)
+.PHONY: format
+
 unit:
 	$(GO_TEST) ./...
 .PHONY: unit

From 5a5a01107676b08d31de71b34918459eaf37792b Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Thu, 28 Nov 2024 13:49:00 +0000
Subject: [PATCH 19/32] script: Remove unused bootstrap script

This is not referenced or documented anywhere and it has not been
touched in years. Remove it.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 script/bootstrap | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100755 script/bootstrap

diff --git a/script/bootstrap b/script/bootstrap
deleted file mode 100755
index 78a195dcf7..0000000000
--- a/script/bootstrap
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# This script helps new contributors set up their local workstation for
-# gophercloud development and contributions.
-
-# Create the environment
-export GOPATH=$HOME/go/gophercloud
-mkdir -p $GOPATH
-
-# Download gophercloud into that environment
-go get github.com/gophercloud/gophercloud
-cd $GOPATH/src/github.com/gophercloud/gophercloud
-git checkout master
-
-# Write out the env.sh convenience file.
-cd $GOPATH
-cat <<EOF >env.sh
-#!/bin/bash
-export GOPATH=$(pwd)
-export GOPHERCLOUD=$GOPATH/src/github.com/gophercloud/gophercloud
-EOF
-chmod a+x env.sh
-
-# Make changes immediately available as a convenience.
-. ./env.sh

From 7225da7ad1289ca6c15465f0badf655b880d690e Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Wed, 20 Mar 2024 13:31:11 +0000
Subject: [PATCH 20/32] trivial: Consistent file extensions

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 .github/{dependabot.yml => dependabot.yaml}                     | 0
 .github/workflows/{codeql-analysis.yml => codeql-analysis.yaml} | 0
 .github/workflows/{greetings.yml => greetings.yaml}             | 0
 .github/workflows/{unit.yml => unit.yaml}                       | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename .github/{dependabot.yml => dependabot.yaml} (100%)
 rename .github/workflows/{codeql-analysis.yml => codeql-analysis.yaml} (100%)
 rename .github/workflows/{greetings.yml => greetings.yaml} (100%)
 rename .github/workflows/{unit.yml => unit.yaml} (100%)

diff --git a/.github/dependabot.yml b/.github/dependabot.yaml
similarity index 100%
rename from .github/dependabot.yml
rename to .github/dependabot.yaml
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yaml
similarity index 100%
rename from .github/workflows/codeql-analysis.yml
rename to .github/workflows/codeql-analysis.yaml
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yaml
similarity index 100%
rename from .github/workflows/greetings.yml
rename to .github/workflows/greetings.yaml
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yaml
similarity index 100%
rename from .github/workflows/unit.yml
rename to .github/workflows/unit.yaml

From e57e4475cfd81137dd92495cedc57ad473fa6b21 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Thu, 21 Mar 2024 12:23:28 +0000
Subject: [PATCH 21/32] script: Address shellcheck warnings

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 script/acceptancetest | 9 +++++----
 script/coverage       | 3 ++-
 script/test           | 1 +
 script/unittest       | 1 +
 script/vet            | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/script/acceptancetest b/script/acceptancetest
index 234f5b0bb6..7e223bae5e 100755
--- a/script/acceptancetest
+++ b/script/acceptancetest
@@ -7,19 +7,20 @@
 # flags and things crash and burn *spectacularly* 🔥🔥🔥
 set -xo pipefail
 
-source $(dirname $0)/stackenv
+# shellcheck disable=SC1091
+source "$(dirname "$0")/stackenv"
 
 # ...but we can do it after the fact
 set -eu
 
 timeout="60m"
-failed=
 
 LOG_DIR=${LOG_DIR:-}
 if [[ -z "${LOG_DIR}" ]]; then
     echo "LOG_DIR not set, will set a temp directory"
     LOG_DIR=/tmp/devstack-logs
 fi
-mkdir -p ${LOG_DIR}
+mkdir -p "${LOG_DIR}"
 
-go test -v -timeout $timeout -tags "fixtures acceptance" ${PACKAGE:-./internal/acceptance/openstack/...} $@ |& tee -a ${LOG_DIR}/acceptance_tests.log
+# shellcheck disable=SC2068
+go test -v -timeout $timeout -tags "fixtures acceptance" "${PACKAGE:-./internal/acceptance/openstack/...}" $@ |& tee -a "${LOG_DIR}/acceptance_tests.log"
diff --git a/script/coverage b/script/coverage
index cd4dec06e5..ec5b2776b8 100755
--- a/script/coverage
+++ b/script/coverage
@@ -19,5 +19,6 @@ for path in $(find . -path '*/testing' -prune -o -path '*/internal' -prune -o -n
   n=$((n+1))
 done
 
-gocovmerge `ls *.coverprofile` > cover.out
+# shellcheck disable=SC2046
+gocovmerge $(ls -- *.coverprofile) > cover.out
 rm ./*.coverprofile
diff --git a/script/test b/script/test
index 77f6af5017..e71e7514bb 100755
--- a/script/test
+++ b/script/test
@@ -4,4 +4,5 @@
 
 set -euxo pipefail
 
+# shellcheck disable=SC2068
 go test -v -tags 'acceptance fixtures' ./... $@
diff --git a/script/unittest b/script/unittest
index 2763e0efd9..1f1b1864f4 100755
--- a/script/unittest
+++ b/script/unittest
@@ -6,4 +6,5 @@ set -euxo pipefail
 
 # Do extra rounds of testing to help identify reauth concurrency issues.
 # All other packages are tested in the `coverage` tests.
+# shellcheck disable=SC2068
 go test -v -race -count=5 ./testing $@
diff --git a/script/vet b/script/vet
index 4f3db40a28..ecb74ef37d 100755
--- a/script/vet
+++ b/script/vet
@@ -4,5 +4,5 @@
 
 set -euxo pipefail
 
-GOFLAGS="-tags=acceptance"
+export GOFLAGS="-tags=acceptance"
 go vet ./...

From 9490b5d314671e97953f1a39dead4456956532b0 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Thu, 30 May 2024 23:51:52 +0100
Subject: [PATCH 22/32] tests: Consist use of th alias

testhelper is too long give how often these things are used.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 .../v1/nodes/testing/results_test.go          |  50 +++----
 .../schedulerstats/testing/fixtures_test.go   |   8 +-
 .../schedulerstats/testing/requests_test.go   |  14 +-
 .../v2/services/testing/requests_test.go      |  14 +-
 .../schedulerstats/testing/fixtures_test.go   |   8 +-
 .../schedulerstats/testing/requests_test.go   |  14 +-
 .../v3/services/testing/requests_test.go      |  14 +-
 .../v2/hypervisors/testing/fixtures_test.go   |  52 +++----
 .../v2/hypervisors/testing/requests_test.go   |  98 ++++++-------
 .../v2/services/testing/requests_test.go      |  42 +++---
 .../v3/ec2tokens/testing/requests_test.go     |  36 ++---
 .../v3/oauth1/testing/fixtures_test.go        | 136 +++++++++---------
 .../identity/v3/tokens/testing/fixtures.go    |   6 +-
 .../v3/tokens/testing/requests_test.go        | 118 +++++++--------
 .../v3/tokens/testing/results_test.go         |  26 ++--
 .../v3/trusts/testing/fixtures_test.go        |  68 ++++-----
 .../schedulerstats/testing/fixtures_test.go   |  14 +-
 .../schedulerstats/testing/requests_test.go   |  30 ++--
 .../v2/services/testing/requests_test.go      |  12 +-
 .../utils/testing/choose_version_test.go      |  66 ++++-----
 pagination/testing/linked_test.go             |  26 ++--
 pagination/testing/marker_test.go             |  24 ++--
 pagination/testing/pagination_test.go         |   4 +-
 pagination/testing/single_test.go             |  26 ++--
 testhelper/client/fake.go                     |   4 +-
 25 files changed, 455 insertions(+), 455 deletions(-)

diff --git a/openstack/baremetal/v1/nodes/testing/results_test.go b/openstack/baremetal/v1/nodes/testing/results_test.go
index 7c683ebecb..acdb59e774 100644
--- a/openstack/baremetal/v1/nodes/testing/results_test.go
+++ b/openstack/baremetal/v1/nodes/testing/results_test.go
@@ -8,68 +8,68 @@ import (
 	"github.com/gophercloud/gophercloud/v2/openstack/baremetal/v1/nodes"
 	"github.com/gophercloud/gophercloud/v2/openstack/baremetalintrospection/v1/introspection"
 	insptest "github.com/gophercloud/gophercloud/v2/openstack/baremetalintrospection/v1/introspection/testing"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
 func TestStandardPluginData(t *testing.T) {
 	var pluginData nodes.PluginData
 	err := pluginData.RawMessage.UnmarshalJSON([]byte(invtest.StandardPluginDataSample))
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	parsedData, err := pluginData.AsStandardData()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, invtest.StandardPluginData, parsedData)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, invtest.StandardPluginData, parsedData)
 
 	irData, inspData, err := pluginData.GuessFormat()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, invtest.StandardPluginData, *irData)
-	testhelper.CheckEquals(t, (*introspection.Data)(nil), inspData)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, invtest.StandardPluginData, *irData)
+	th.CheckEquals(t, (*introspection.Data)(nil), inspData)
 }
 
 func TestInspectorPluginData(t *testing.T) {
 	var pluginData nodes.PluginData
 	err := pluginData.RawMessage.UnmarshalJSON([]byte(insptest.IntrospectionDataJSONSample))
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	parsedData, err := pluginData.AsInspectorData()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, insptest.IntrospectionDataRes, parsedData)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, insptest.IntrospectionDataRes, parsedData)
 
 	irData, inspData, err := pluginData.GuessFormat()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckEquals(t, (*inventory.StandardPluginData)(nil), irData)
-	testhelper.CheckDeepEquals(t, insptest.IntrospectionDataRes, *inspData)
+	th.AssertNoErr(t, err)
+	th.CheckEquals(t, (*inventory.StandardPluginData)(nil), irData)
+	th.CheckDeepEquals(t, insptest.IntrospectionDataRes, *inspData)
 }
 
 func TestGuessFormatUnknownDefaultsToIronic(t *testing.T) {
 	var pluginData nodes.PluginData
 	err := pluginData.RawMessage.UnmarshalJSON([]byte("{}"))
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	irData, inspData, err := pluginData.GuessFormat()
-	testhelper.CheckDeepEquals(t, inventory.StandardPluginData{}, *irData)
-	testhelper.CheckEquals(t, (*introspection.Data)(nil), inspData)
-	testhelper.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, inventory.StandardPluginData{}, *irData)
+	th.CheckEquals(t, (*introspection.Data)(nil), inspData)
+	th.AssertNoErr(t, err)
 }
 
 func TestGuessFormatErrors(t *testing.T) {
 	var pluginData nodes.PluginData
 	err := pluginData.RawMessage.UnmarshalJSON([]byte("\"banana\""))
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	irData, inspData, err := pluginData.GuessFormat()
-	testhelper.CheckEquals(t, (*inventory.StandardPluginData)(nil), irData)
-	testhelper.CheckEquals(t, (*introspection.Data)(nil), inspData)
-	testhelper.AssertErr(t, err)
+	th.CheckEquals(t, (*inventory.StandardPluginData)(nil), irData)
+	th.CheckEquals(t, (*introspection.Data)(nil), inspData)
+	th.AssertErr(t, err)
 
 	failsInspectorConversion := `{
 	    "interfaces": "banana"
 	}`
 	err = pluginData.RawMessage.UnmarshalJSON([]byte(failsInspectorConversion))
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	irData, inspData, err = pluginData.GuessFormat()
-	testhelper.CheckEquals(t, (*inventory.StandardPluginData)(nil), irData)
-	testhelper.CheckEquals(t, (*introspection.Data)(nil), inspData)
-	testhelper.AssertErr(t, err)
+	th.CheckEquals(t, (*inventory.StandardPluginData)(nil), irData)
+	th.CheckEquals(t, (*introspection.Data)(nil), inspData)
+	th.AssertErr(t, err)
 }
diff --git a/openstack/blockstorage/v2/schedulerstats/testing/fixtures_test.go b/openstack/blockstorage/v2/schedulerstats/testing/fixtures_test.go
index 6f0317ef60..3a7fee8160 100644
--- a/openstack/blockstorage/v2/schedulerstats/testing/fixtures_test.go
+++ b/openstack/blockstorage/v2/schedulerstats/testing/fixtures_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v2/schedulerstats"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
@@ -94,9 +94,9 @@ var (
 )
 
 func HandleStoragePoolsListSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/scheduler-stats/get_pools", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/scheduler-stats/get_pools", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 
diff --git a/openstack/blockstorage/v2/schedulerstats/testing/requests_test.go b/openstack/blockstorage/v2/schedulerstats/testing/requests_test.go
index 709ddeac58..7a6cb8b450 100644
--- a/openstack/blockstorage/v2/schedulerstats/testing/requests_test.go
+++ b/openstack/blockstorage/v2/schedulerstats/testing/requests_test.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v2/schedulerstats"
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
 func TestListStoragePoolsDetail(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleStoragePoolsListSuccessfully(t)
 
 	pages := 0
@@ -20,18 +20,18 @@ func TestListStoragePoolsDetail(t *testing.T) {
 		pages++
 
 		actual, err := schedulerstats.ExtractStoragePools(page)
-		testhelper.AssertNoErr(t, err)
+		th.AssertNoErr(t, err)
 
 		if len(actual) != 2 {
 			t.Fatalf("Expected 2 backends, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, StoragePoolFake1, actual[0])
-		testhelper.CheckDeepEquals(t, StoragePoolFake2, actual[1])
+		th.CheckDeepEquals(t, StoragePoolFake1, actual[0])
+		th.CheckDeepEquals(t, StoragePoolFake2, actual[1])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
diff --git a/openstack/blockstorage/v2/services/testing/requests_test.go b/openstack/blockstorage/v2/services/testing/requests_test.go
index 8ce1266d7e..d1277a99bf 100644
--- a/openstack/blockstorage/v2/services/testing/requests_test.go
+++ b/openstack/blockstorage/v2/services/testing/requests_test.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v2/services"
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
 func TestListServices(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleListSuccessfully(t)
 
 	pages := 0
@@ -27,14 +27,14 @@ func TestListServices(t *testing.T) {
 		if len(actual) != 3 {
 			t.Fatalf("Expected 3 services, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, FirstFakeService, actual[0])
-		testhelper.CheckDeepEquals(t, SecondFakeService, actual[1])
-		testhelper.CheckDeepEquals(t, ThirdFakeService, actual[2])
+		th.CheckDeepEquals(t, FirstFakeService, actual[0])
+		th.CheckDeepEquals(t, SecondFakeService, actual[1])
+		th.CheckDeepEquals(t, ThirdFakeService, actual[2])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
diff --git a/openstack/blockstorage/v3/schedulerstats/testing/fixtures_test.go b/openstack/blockstorage/v3/schedulerstats/testing/fixtures_test.go
index df0ccaa7f5..0a1286e862 100644
--- a/openstack/blockstorage/v3/schedulerstats/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/schedulerstats/testing/fixtures_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/schedulerstats"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
@@ -94,9 +94,9 @@ var (
 )
 
 func HandleStoragePoolsListSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/scheduler-stats/get_pools", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/scheduler-stats/get_pools", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 
diff --git a/openstack/blockstorage/v3/schedulerstats/testing/requests_test.go b/openstack/blockstorage/v3/schedulerstats/testing/requests_test.go
index b5e3f31ef6..c125763276 100644
--- a/openstack/blockstorage/v3/schedulerstats/testing/requests_test.go
+++ b/openstack/blockstorage/v3/schedulerstats/testing/requests_test.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/schedulerstats"
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
 func TestListStoragePoolsDetail(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleStoragePoolsListSuccessfully(t)
 
 	pages := 0
@@ -20,18 +20,18 @@ func TestListStoragePoolsDetail(t *testing.T) {
 		pages++
 
 		actual, err := schedulerstats.ExtractStoragePools(page)
-		testhelper.AssertNoErr(t, err)
+		th.AssertNoErr(t, err)
 
 		if len(actual) != 2 {
 			t.Fatalf("Expected 2 backends, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, StoragePoolFake1, actual[0])
-		testhelper.CheckDeepEquals(t, StoragePoolFake2, actual[1])
+		th.CheckDeepEquals(t, StoragePoolFake1, actual[0])
+		th.CheckDeepEquals(t, StoragePoolFake2, actual[1])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
diff --git a/openstack/blockstorage/v3/services/testing/requests_test.go b/openstack/blockstorage/v3/services/testing/requests_test.go
index 1fd5bcdd1e..4e291da96b 100644
--- a/openstack/blockstorage/v3/services/testing/requests_test.go
+++ b/openstack/blockstorage/v3/services/testing/requests_test.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/services"
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
 func TestListServices(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleListSuccessfully(t)
 
 	pages := 0
@@ -27,14 +27,14 @@ func TestListServices(t *testing.T) {
 		if len(actual) != 3 {
 			t.Fatalf("Expected 3 services, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, FirstFakeService, actual[0])
-		testhelper.CheckDeepEquals(t, SecondFakeService, actual[1])
-		testhelper.CheckDeepEquals(t, ThirdFakeService, actual[2])
+		th.CheckDeepEquals(t, FirstFakeService, actual[0])
+		th.CheckDeepEquals(t, SecondFakeService, actual[1])
+		th.CheckDeepEquals(t, ThirdFakeService, actual[2])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
diff --git a/openstack/compute/v2/hypervisors/testing/fixtures_test.go b/openstack/compute/v2/hypervisors/testing/fixtures_test.go
index a969f1f825..6e4b2e4aff 100644
--- a/openstack/compute/v2/hypervisors/testing/fixtures_test.go
+++ b/openstack/compute/v2/hypervisors/testing/fixtures_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/hypervisors"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
@@ -600,9 +600,9 @@ var (
 )
 
 func HandleHypervisorsStatisticsSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/os-hypervisors/statistics", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/os-hypervisors/statistics", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 		fmt.Fprintf(w, HypervisorsStatisticsBody)
@@ -610,9 +610,9 @@ func HandleHypervisorsStatisticsSuccessfully(t *testing.T) {
 }
 
 func HandleHypervisorListPre253Successfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/os-hypervisors/detail", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/os-hypervisors/detail", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 		fmt.Fprintf(w, HypervisorListBodyPre253)
@@ -620,9 +620,9 @@ func HandleHypervisorListPre253Successfully(t *testing.T) {
 }
 
 func HandleHypervisorListSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/os-hypervisors/detail", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/os-hypervisors/detail", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 		fmt.Fprintf(w, HypervisorListBody)
@@ -630,10 +630,10 @@ func HandleHypervisorListSuccessfully(t *testing.T) {
 }
 
 func HandleHypervisorListWithParametersSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/os-hypervisors/detail", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
-		testhelper.TestFormValues(t, r, map[string]string{
+	th.Mux.HandleFunc("/os-hypervisors/detail", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+		th.TestFormValues(t, r, map[string]string{
 			"with_servers": "true",
 		})
 
@@ -643,9 +643,9 @@ func HandleHypervisorListWithParametersSuccessfully(t *testing.T) {
 }
 
 func HandleHypervisorGetSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/os-hypervisors/"+HypervisorFake.ID, func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/os-hypervisors/"+HypervisorFake.ID, func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 		fmt.Fprintf(w, HypervisorGetBody)
@@ -653,9 +653,9 @@ func HandleHypervisorGetSuccessfully(t *testing.T) {
 }
 
 func HandleHypervisorGetEmptyCPUInfoSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/os-hypervisors/"+HypervisorFake.ID, func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/os-hypervisors/"+HypervisorFake.ID, func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 		fmt.Fprintf(w, HypervisorGetEmptyCPUInfoBody)
@@ -663,9 +663,9 @@ func HandleHypervisorGetEmptyCPUInfoSuccessfully(t *testing.T) {
 }
 
 func HandleHypervisorAfterV287ResponseSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/os-hypervisors/"+HypervisorFake.ID, func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/os-hypervisors/"+HypervisorFake.ID, func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 		fmt.Fprintf(w, HypervisorAfterV287ResponseBody)
@@ -673,9 +673,9 @@ func HandleHypervisorAfterV287ResponseSuccessfully(t *testing.T) {
 }
 
 func HandleHypervisorUptimeSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/os-hypervisors/"+HypervisorFake.ID+"/uptime", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/os-hypervisors/"+HypervisorFake.ID+"/uptime", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 		fmt.Fprintf(w, HypervisorUptimeBody)
diff --git a/openstack/compute/v2/hypervisors/testing/requests_test.go b/openstack/compute/v2/hypervisors/testing/requests_test.go
index 493e8138d1..0303f7f1d0 100644
--- a/openstack/compute/v2/hypervisors/testing/requests_test.go
+++ b/openstack/compute/v2/hypervisors/testing/requests_test.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/hypervisors"
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
 func TestListHypervisorsPre253(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleHypervisorListPre253Successfully(t)
 
 	pages := 0
@@ -28,13 +28,13 @@ func TestListHypervisorsPre253(t *testing.T) {
 		if len(actual) != 2 {
 			t.Fatalf("Expected 2 hypervisors, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, HypervisorFakePre253, actual[0])
-		testhelper.CheckDeepEquals(t, HypervisorFakePre253, actual[1])
+		th.CheckDeepEquals(t, HypervisorFakePre253, actual[0])
+		th.CheckDeepEquals(t, HypervisorFakePre253, actual[1])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
@@ -42,21 +42,21 @@ func TestListHypervisorsPre253(t *testing.T) {
 }
 
 func TestListAllHypervisorsPre253(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleHypervisorListPre253Successfully(t)
 
 	allPages, err := hypervisors.List(client.ServiceClient(), hypervisors.ListOpts{}).AllPages(context.TODO())
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 	actual, err := hypervisors.ExtractHypervisors(allPages)
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, HypervisorFakePre253, actual[0])
-	testhelper.CheckDeepEquals(t, HypervisorFakePre253, actual[1])
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, HypervisorFakePre253, actual[0])
+	th.CheckDeepEquals(t, HypervisorFakePre253, actual[1])
 }
 
 func TestListHypervisors(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleHypervisorListSuccessfully(t)
 
 	pages := 0
@@ -72,13 +72,13 @@ func TestListHypervisors(t *testing.T) {
 		if len(actual) != 2 {
 			t.Fatalf("Expected 2 hypervisors, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, HypervisorFake, actual[0])
-		testhelper.CheckDeepEquals(t, HypervisorFake, actual[1])
+		th.CheckDeepEquals(t, HypervisorFake, actual[0])
+		th.CheckDeepEquals(t, HypervisorFake, actual[1])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
@@ -86,88 +86,88 @@ func TestListHypervisors(t *testing.T) {
 }
 
 func TestListAllHypervisors(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleHypervisorListSuccessfully(t)
 
 	allPages, err := hypervisors.List(client.ServiceClient(), hypervisors.ListOpts{}).AllPages(context.TODO())
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 	actual, err := hypervisors.ExtractHypervisors(allPages)
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, HypervisorFake, actual[0])
-	testhelper.CheckDeepEquals(t, HypervisorFake, actual[1])
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, HypervisorFake, actual[0])
+	th.CheckDeepEquals(t, HypervisorFake, actual[1])
 }
 
 func TestListAllHypervisorsWithParameters(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleHypervisorListWithParametersSuccessfully(t)
 
 	with_servers := true
 	allPages, err := hypervisors.List(client.ServiceClient(), hypervisors.ListOpts{WithServers: &with_servers}).AllPages(context.TODO())
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 	actual, err := hypervisors.ExtractHypervisors(allPages)
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, HypervisorFakeWithParameters, actual[0])
-	testhelper.CheckDeepEquals(t, HypervisorFakeWithParameters, actual[1])
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, HypervisorFakeWithParameters, actual[0])
+	th.CheckDeepEquals(t, HypervisorFakeWithParameters, actual[1])
 }
 
 func TestHypervisorsStatistics(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleHypervisorsStatisticsSuccessfully(t)
 
 	expected := HypervisorsStatisticsExpected
 
 	actual, err := hypervisors.GetStatistics(context.TODO(), client.ServiceClient()).Extract()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, &expected, actual)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, &expected, actual)
 }
 
 func TestGetHypervisor(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleHypervisorGetSuccessfully(t)
 
 	expected := HypervisorFake
 
 	actual, err := hypervisors.Get(context.TODO(), client.ServiceClient(), expected.ID).Extract()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, &expected, actual)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, &expected, actual)
 }
 
 func TestGetHypervisorEmptyCPUInfo(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleHypervisorGetEmptyCPUInfoSuccessfully(t)
 
 	expected := HypervisorEmptyCPUInfo
 
 	actual, err := hypervisors.Get(context.TODO(), client.ServiceClient(), expected.ID).Extract()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, &expected, actual)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, &expected, actual)
 }
 
 func TestGetHypervisorAfterV287Response(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleHypervisorAfterV287ResponseSuccessfully(t)
 
 	expected := HypervisorAfterV287Response
 
 	actual, err := hypervisors.Get(context.TODO(), client.ServiceClient(), expected.ID).Extract()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, &expected, actual)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, &expected, actual)
 }
 
 func TestHypervisorsUptime(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleHypervisorUptimeSuccessfully(t)
 
 	expected := HypervisorUptimeExpected
 
 	actual, err := hypervisors.GetUptime(context.TODO(), client.ServiceClient(), HypervisorFake.ID).Extract()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, &expected, actual)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, &expected, actual)
 }
diff --git a/openstack/compute/v2/services/testing/requests_test.go b/openstack/compute/v2/services/testing/requests_test.go
index c201c9f4d6..df7a9e9a17 100644
--- a/openstack/compute/v2/services/testing/requests_test.go
+++ b/openstack/compute/v2/services/testing/requests_test.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/services"
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
 func TestListServicesPre253(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleListPre253Successfully(t)
 
 	pages := 0
@@ -27,15 +27,15 @@ func TestListServicesPre253(t *testing.T) {
 		if len(actual) != 4 {
 			t.Fatalf("Expected 4 services, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, FirstFakeServicePre253, actual[0])
-		testhelper.CheckDeepEquals(t, SecondFakeServicePre253, actual[1])
-		testhelper.CheckDeepEquals(t, ThirdFakeServicePre253, actual[2])
-		testhelper.CheckDeepEquals(t, FourthFakeServicePre253, actual[3])
+		th.CheckDeepEquals(t, FirstFakeServicePre253, actual[0])
+		th.CheckDeepEquals(t, SecondFakeServicePre253, actual[1])
+		th.CheckDeepEquals(t, ThirdFakeServicePre253, actual[2])
+		th.CheckDeepEquals(t, FourthFakeServicePre253, actual[3])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
@@ -43,8 +43,8 @@ func TestListServicesPre253(t *testing.T) {
 }
 
 func TestListServices(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleListSuccessfully(t)
 
 	pages := 0
@@ -63,15 +63,15 @@ func TestListServices(t *testing.T) {
 		if len(actual) != 4 {
 			t.Fatalf("Expected 4 services, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, FirstFakeService, actual[0])
-		testhelper.CheckDeepEquals(t, SecondFakeService, actual[1])
-		testhelper.CheckDeepEquals(t, ThirdFakeService, actual[2])
-		testhelper.CheckDeepEquals(t, FourthFakeService, actual[3])
+		th.CheckDeepEquals(t, FirstFakeService, actual[0])
+		th.CheckDeepEquals(t, SecondFakeService, actual[1])
+		th.CheckDeepEquals(t, ThirdFakeService, actual[2])
+		th.CheckDeepEquals(t, FourthFakeService, actual[3])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
@@ -79,8 +79,8 @@ func TestListServices(t *testing.T) {
 }
 
 func TestUpdateService(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleUpdateSuccessfully(t)
 
 	client := client.ServiceClient()
@@ -89,16 +89,16 @@ func TestUpdateService(t *testing.T) {
 		t.Fatalf("Unexpected Update error: %v", err)
 	}
 
-	testhelper.CheckDeepEquals(t, FakeServiceUpdateBody, *actual)
+	th.CheckDeepEquals(t, FakeServiceUpdateBody, *actual)
 }
 
 func TestDeleteService(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleDeleteSuccessfully(t)
 
 	client := client.ServiceClient()
 	res := services.Delete(context.TODO(), client, "fake-service-id")
 
-	testhelper.AssertNoErr(t, res.Err)
+	th.AssertNoErr(t, res.Err)
 }
diff --git a/openstack/identity/v3/ec2tokens/testing/requests_test.go b/openstack/identity/v3/ec2tokens/testing/requests_test.go
index 188329daab..13239e2d91 100644
--- a/openstack/identity/v3/ec2tokens/testing/requests_test.go
+++ b/openstack/identity/v3/ec2tokens/testing/requests_test.go
@@ -12,24 +12,24 @@ import (
 	"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/ec2tokens"
 	"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
 	tokens_testing "github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens/testing"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
 // authTokenPost verifies that providing certain AuthOptions and Scope results in an expected JSON structure.
 func authTokenPost(t *testing.T, options ec2tokens.AuthOptions, requestJSON string) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 
 	client := gophercloud.ServiceClient{
 		ProviderClient: &gophercloud.ProviderClient{},
-		Endpoint:       testhelper.Endpoint(),
+		Endpoint:       th.Endpoint(),
 	}
 
-	testhelper.Mux.HandleFunc("/ec2tokens", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "POST")
-		testhelper.TestHeader(t, r, "Content-Type", "application/json")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestJSONRequest(t, r, requestJSON)
+	th.Mux.HandleFunc("/ec2tokens", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "POST")
+		th.TestHeader(t, r, "Content-Type", "application/json")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestJSONRequest(t, r, requestJSON)
 
 		w.WriteHeader(http.StatusOK)
 		fmt.Fprintf(w, tokens_testing.TokenOutput)
@@ -40,8 +40,8 @@ func authTokenPost(t *testing.T, options ec2tokens.AuthOptions, requestJSON stri
 	}
 
 	actual, err := ec2tokens.Create(context.TODO(), &client, &options).Extract()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, expected, actual)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, expected, actual)
 }
 
 func TestCreateV2(t *testing.T) {
@@ -224,7 +224,7 @@ func TestEC2CredentialsBuildCanonicalQueryStringV2(t *testing.T) {
 		"Value":  "bar",
 	}
 	expected := "Action=foo&Value=bar"
-	testhelper.CheckEquals(t, expected, ec2tokens.EC2CredentialsBuildCanonicalQueryStringV2(params))
+	th.CheckEquals(t, expected, ec2tokens.EC2CredentialsBuildCanonicalQueryStringV2(params))
 }
 
 func TestEC2CredentialsBuildStringToSignV2(t *testing.T) {
@@ -238,7 +238,7 @@ func TestEC2CredentialsBuildStringToSignV2(t *testing.T) {
 		},
 	}
 	expected := []byte("GET\nlocalhost\n/\nAction=foo&Value=bar")
-	testhelper.CheckDeepEquals(t, expected, ec2tokens.EC2CredentialsBuildStringToSignV2(opts))
+	th.CheckDeepEquals(t, expected, ec2tokens.EC2CredentialsBuildStringToSignV2(opts))
 }
 
 func TestEC2CredentialsBuildCanonicalQueryStringV4(t *testing.T) {
@@ -247,8 +247,8 @@ func TestEC2CredentialsBuildCanonicalQueryStringV4(t *testing.T) {
 		"Value":  "bar",
 	}
 	expected := "Action=foo&Value=bar"
-	testhelper.CheckEquals(t, expected, ec2tokens.EC2CredentialsBuildCanonicalQueryStringV4("foo", params))
-	testhelper.CheckEquals(t, "", ec2tokens.EC2CredentialsBuildCanonicalQueryStringV4("POST", params))
+	th.CheckEquals(t, expected, ec2tokens.EC2CredentialsBuildCanonicalQueryStringV4("foo", params))
+	th.CheckEquals(t, "", ec2tokens.EC2CredentialsBuildCanonicalQueryStringV4("POST", params))
 }
 
 func TestEC2CredentialsBuildCanonicalHeadersV4(t *testing.T) {
@@ -258,12 +258,12 @@ func TestEC2CredentialsBuildCanonicalHeadersV4(t *testing.T) {
 	}
 	signedHeaders := "foo;baz"
 	expected := "foo:bar\nbaz:qux\n"
-	testhelper.CheckEquals(t, expected, ec2tokens.EC2CredentialsBuildCanonicalHeadersV4(headers, signedHeaders))
+	th.CheckEquals(t, expected, ec2tokens.EC2CredentialsBuildCanonicalHeadersV4(headers, signedHeaders))
 }
 
 func TestEC2CredentialsBuildSignatureKeyV4(t *testing.T) {
 	expected := "246626bd815b0a0cae4bedc3f4e124ca25e208cd75fd812d836aeae184de038a"
-	testhelper.CheckEquals(t, expected, hex.EncodeToString((ec2tokens.EC2CredentialsBuildSignatureKeyV4("foo", "bar", "baz", time.Time{}))))
+	th.CheckEquals(t, expected, hex.EncodeToString((ec2tokens.EC2CredentialsBuildSignatureKeyV4("foo", "bar", "baz", time.Time{}))))
 }
 
 func TestEC2CredentialsBuildSignatureV4(t *testing.T) {
@@ -284,5 +284,5 @@ func TestEC2CredentialsBuildSignatureV4(t *testing.T) {
 	stringToSign := ec2tokens.EC2CredentialsBuildStringToSignV4(opts, "host", "foo", date)
 	key := ec2tokens.EC2CredentialsBuildSignatureKeyV4("", "", "", date)
 
-	testhelper.CheckEquals(t, expected, ec2tokens.EC2CredentialsBuildSignatureV4(key, stringToSign))
+	th.CheckEquals(t, expected, ec2tokens.EC2CredentialsBuildSignatureV4(key, stringToSign))
 }
diff --git a/openstack/identity/v3/oauth1/testing/fixtures_test.go b/openstack/identity/v3/oauth1/testing/fixtures_test.go
index 8a2bfe5cdb..3e8d144047 100644
--- a/openstack/identity/v3/oauth1/testing/fixtures_test.go
+++ b/openstack/identity/v3/oauth1/testing/fixtures_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/oauth1"
 	tokens "github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens/testing"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
@@ -221,39 +221,39 @@ var ExpectedUserAccessTokenRolesSlice = []oauth1.AccessTokenRole{UserAccessToken
 // HandleCreateConsumer creates an HTTP handler at `/OS-OAUTH1/consumers` on the
 // test handler mux that tests consumer creation.
 func HandleCreateConsumer(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-OAUTH1/consumers", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "POST")
-		testhelper.TestHeader(t, r, "Content-Type", "application/json")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestJSONRequest(t, r, CreateConsumerRequest)
+	th.Mux.HandleFunc("/OS-OAUTH1/consumers", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "POST")
+		th.TestHeader(t, r, "Content-Type", "application/json")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestJSONRequest(t, r, CreateConsumerRequest)
 
 		w.WriteHeader(http.StatusCreated)
 		_, err := fmt.Fprintf(w, CreateConsumerResponse)
-		testhelper.AssertNoErr(t, err)
+		th.AssertNoErr(t, err)
 	})
 }
 
 // HandleUpdateConsumer creates an HTTP handler at `/OS-OAUTH1/consumers/7fea2d` on the
 // test handler mux that tests consumer update.
 func HandleUpdateConsumer(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-OAUTH1/consumers/7fea2d", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "PATCH")
-		testhelper.TestHeader(t, r, "Content-Type", "application/json")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestJSONRequest(t, r, UpdateConsumerRequest)
+	th.Mux.HandleFunc("/OS-OAUTH1/consumers/7fea2d", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "PATCH")
+		th.TestHeader(t, r, "Content-Type", "application/json")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestJSONRequest(t, r, UpdateConsumerRequest)
 
 		w.WriteHeader(http.StatusOK)
 		_, err := fmt.Fprintf(w, UpdateConsumerResponse)
-		testhelper.AssertNoErr(t, err)
+		th.AssertNoErr(t, err)
 	})
 }
 
 // HandleDeleteConsumer creates an HTTP handler at `/OS-OAUTH1/consumers/7fea2d` on the
 // test handler mux that tests consumer deletion.
 func HandleDeleteConsumer(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-OAUTH1/consumers/7fea2d", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "DELETE")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/OS-OAUTH1/consumers/7fea2d", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "DELETE")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.WriteHeader(http.StatusNoContent)
 	})
@@ -262,10 +262,10 @@ func HandleDeleteConsumer(t *testing.T) {
 // HandleGetConsumer creates an HTTP handler at `/OS-OAUTH1/consumers/7fea2d` on the
 // test handler mux that responds with a single consumer.
 func HandleGetConsumer(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-OAUTH1/consumers/7fea2d", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/OS-OAUTH1/consumers/7fea2d", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -299,10 +299,10 @@ var ExpectedConsumersSlice = []oauth1.Consumer{FirstConsumer, SecondConsumer}
 // HandleListConsumers creates an HTTP handler at `/OS-OAUTH1/consumers` on the
 // test handler mux that responds with a list of two consumers.
 func HandleListConsumers(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-OAUTH1/consumers", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/OS-OAUTH1/consumers", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -319,13 +319,13 @@ var Token = oauth1.Token{
 // HandleRequestToken creates an HTTP handler at `/OS-OAUTH1/request_token` on the
 // test handler mux that responds with a OAuth1 unauthorized token.
 func HandleRequestToken(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-OAUTH1/request_token", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "POST")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
-		testhelper.TestHeader(t, r, "Authorization", `OAuth oauth_callback="oob", oauth_consumer_key="7fea2d", oauth_nonce="71416001758914252991586795052", oauth_signature_method="HMAC-SHA1", oauth_timestamp="0", oauth_version="1.0", oauth_signature="jCSPVryCYF52Ks0VNNmBmeKSGuw%3D"`)
-		testhelper.TestHeader(t, r, "Requested-Project-Id", "1df927e8a466498f98788ed73d3c8ab4")
-		testhelper.TestBody(t, r, "")
+	th.Mux.HandleFunc("/OS-OAUTH1/request_token", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "POST")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+		th.TestHeader(t, r, "Authorization", `OAuth oauth_callback="oob", oauth_consumer_key="7fea2d", oauth_nonce="71416001758914252991586795052", oauth_signature_method="HMAC-SHA1", oauth_timestamp="0", oauth_version="1.0", oauth_signature="jCSPVryCYF52Ks0VNNmBmeKSGuw%3D"`)
+		th.TestHeader(t, r, "Requested-Project-Id", "1df927e8a466498f98788ed73d3c8ab4")
+		th.TestBody(t, r, "")
 
 		w.Header().Set("Content-Type", oauth1.OAuth1TokenContentType)
 		w.WriteHeader(http.StatusCreated)
@@ -336,15 +336,15 @@ func HandleRequestToken(t *testing.T) {
 // HandleAuthorizeToken creates an HTTP handler at `/OS-OAUTH1/authorize/29971f` on the
 // test handler mux that tests unauthorized token authorization.
 func HandleAuthorizeToken(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-OAUTH1/authorize/29971f", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "PUT")
-		testhelper.TestHeader(t, r, "Content-Type", "application/json")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestJSONRequest(t, r, AuthorizeTokenRequest)
+	th.Mux.HandleFunc("/OS-OAUTH1/authorize/29971f", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "PUT")
+		th.TestHeader(t, r, "Content-Type", "application/json")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestJSONRequest(t, r, AuthorizeTokenRequest)
 
 		w.WriteHeader(http.StatusOK)
 		_, err := fmt.Fprintf(w, AuthorizeTokenResponse)
-		testhelper.AssertNoErr(t, err)
+		th.AssertNoErr(t, err)
 	})
 }
 
@@ -357,12 +357,12 @@ var AccessToken = oauth1.Token{
 // HandleCreateAccessToken creates an HTTP handler at `/OS-OAUTH1/access_token` on the
 // test handler mux that responds with a OAuth1 access token.
 func HandleCreateAccessToken(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-OAUTH1/access_token", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "POST")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
-		testhelper.TestHeader(t, r, "Authorization", `OAuth oauth_consumer_key="7fea2d", oauth_nonce="66148873158553341551586804894", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1586804894", oauth_token="29971f", oauth_verifier="8171", oauth_version="1.0", oauth_signature="usQ89Y3IYG0IBE7%2Ft8aVsc8XgEk%3D"`)
-		testhelper.TestBody(t, r, "")
+	th.Mux.HandleFunc("/OS-OAUTH1/access_token", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "POST")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+		th.TestHeader(t, r, "Authorization", `OAuth oauth_consumer_key="7fea2d", oauth_nonce="66148873158553341551586804894", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1586804894", oauth_token="29971f", oauth_verifier="8171", oauth_version="1.0", oauth_signature="usQ89Y3IYG0IBE7%2Ft8aVsc8XgEk%3D"`)
+		th.TestBody(t, r, "")
 
 		w.Header().Set("Content-Type", oauth1.OAuth1TokenContentType)
 		w.WriteHeader(http.StatusCreated)
@@ -373,10 +373,10 @@ func HandleCreateAccessToken(t *testing.T) {
 // HandleGetAccessToken creates an HTTP handler at `/users/ce9e07/OS-OAUTH1/access_tokens/6be26a` on the
 // test handler mux that responds with a single access token.
 func HandleGetAccessToken(t *testing.T) {
-	testhelper.Mux.HandleFunc("/users/ce9e07/OS-OAUTH1/access_tokens/6be26a", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/users/ce9e07/OS-OAUTH1/access_tokens/6be26a", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -387,9 +387,9 @@ func HandleGetAccessToken(t *testing.T) {
 // HandleRevokeAccessToken creates an HTTP handler at `/users/ce9e07/OS-OAUTH1/access_tokens/6be26a` on the
 // test handler mux that tests access token deletion.
 func HandleRevokeAccessToken(t *testing.T) {
-	testhelper.Mux.HandleFunc("/users/ce9e07/OS-OAUTH1/access_tokens/6be26a", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "DELETE")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/users/ce9e07/OS-OAUTH1/access_tokens/6be26a", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "DELETE")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.WriteHeader(http.StatusNoContent)
 	})
@@ -398,10 +398,10 @@ func HandleRevokeAccessToken(t *testing.T) {
 // HandleListAccessTokens creates an HTTP handler at `/users/ce9e07/OS-OAUTH1/access_tokens` on the
 // test handler mux that responds with a slice of access tokens.
 func HandleListAccessTokens(t *testing.T) {
-	testhelper.Mux.HandleFunc("/users/ce9e07/OS-OAUTH1/access_tokens", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/users/ce9e07/OS-OAUTH1/access_tokens", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -412,10 +412,10 @@ func HandleListAccessTokens(t *testing.T) {
 // HandleListAccessTokenRoles creates an HTTP handler at `/users/ce9e07/OS-OAUTH1/access_tokens/6be26a/roles` on the
 // test handler mux that responds with a slice of access token roles.
 func HandleListAccessTokenRoles(t *testing.T) {
-	testhelper.Mux.HandleFunc("/users/ce9e07/OS-OAUTH1/access_tokens/6be26a/roles", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/users/ce9e07/OS-OAUTH1/access_tokens/6be26a/roles", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -426,10 +426,10 @@ func HandleListAccessTokenRoles(t *testing.T) {
 // HandleGetAccessTokenRole creates an HTTP handler at `/users/ce9e07/OS-OAUTH1/access_tokens/6be26a/roles/5ad150` on the
 // test handler mux that responds with an access token role.
 func HandleGetAccessTokenRole(t *testing.T) {
-	testhelper.Mux.HandleFunc("/users/ce9e07/OS-OAUTH1/access_tokens/6be26a/roles/5ad150", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/users/ce9e07/OS-OAUTH1/access_tokens/6be26a/roles/5ad150", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -440,12 +440,12 @@ func HandleGetAccessTokenRole(t *testing.T) {
 // HandleAuthenticate creates an HTTP handler at `/auth/tokens` on the
 // test handler mux that responds with an OpenStack token.
 func HandleAuthenticate(t *testing.T) {
-	testhelper.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "POST")
-		testhelper.TestHeader(t, r, "Content-Type", "application/json")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "Authorization", `OAuth oauth_consumer_key="7fea2d", oauth_nonce="66148873158553341551586804894", oauth_signature_method="HMAC-SHA1", oauth_timestamp="0", oauth_token="accd36", oauth_version="1.0", oauth_signature="JgMHu4e7rXGlqz3A%2FLhHDMvtjp8%3D"`)
-		testhelper.TestJSONRequest(t, r, `{"auth": {"identity": {"oauth1": {}, "methods": ["oauth1"]}}}`)
+	th.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "POST")
+		th.TestHeader(t, r, "Content-Type", "application/json")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "Authorization", `OAuth oauth_consumer_key="7fea2d", oauth_nonce="66148873158553341551586804894", oauth_signature_method="HMAC-SHA1", oauth_timestamp="0", oauth_token="accd36", oauth_version="1.0", oauth_signature="JgMHu4e7rXGlqz3A%2FLhHDMvtjp8%3D"`)
+		th.TestJSONRequest(t, r, `{"auth": {"identity": {"oauth1": {}, "methods": ["oauth1"]}}}`)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
diff --git a/openstack/identity/v3/tokens/testing/fixtures.go b/openstack/identity/v3/tokens/testing/fixtures.go
index 0b4ccafa26..00797867c9 100644
--- a/openstack/identity/v3/tokens/testing/fixtures.go
+++ b/openstack/identity/v3/tokens/testing/fixtures.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2"
 	"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
 const testTokenID = "130f6c17-420e-4a0b-97b0-0c9cf2a05f30"
@@ -310,7 +310,7 @@ func getGetResult(t *testing.T) tokens.GetResult {
 		"X-Subject-Token": []string{testTokenID},
 	}
 	err := json.Unmarshal([]byte(TokenOutput), &result.Body)
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 	return result
 }
 
@@ -320,6 +320,6 @@ func getGetDomainResult(t *testing.T) tokens.GetResult {
 		"X-Subject-Token": []string{testTokenID},
 	}
 	err := json.Unmarshal([]byte(DomainToken), &result.Body)
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 	return result
 }
diff --git a/openstack/identity/v3/tokens/testing/requests_test.go b/openstack/identity/v3/tokens/testing/requests_test.go
index 9a9a59fc14..c0aafb9ad4 100644
--- a/openstack/identity/v3/tokens/testing/requests_test.go
+++ b/openstack/identity/v3/tokens/testing/requests_test.go
@@ -9,25 +9,25 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2"
 	"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
 // authTokenPost verifies that providing certain AuthOptions and Scope results in an expected JSON structure.
 func authTokenPost(t *testing.T, options tokens.AuthOptions, scope *tokens.Scope, requestJSON string) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 
 	client := gophercloud.ServiceClient{
 		ProviderClient: &gophercloud.ProviderClient{},
-		Endpoint:       testhelper.Endpoint(),
+		Endpoint:       th.Endpoint(),
 	}
 
-	testhelper.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "POST")
-		testhelper.TestHeader(t, r, "Content-Type", "application/json")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestJSONRequest(t, r, requestJSON)
+	th.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "POST")
+		th.TestHeader(t, r, "Content-Type", "application/json")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestJSONRequest(t, r, requestJSON)
 
 		w.WriteHeader(http.StatusCreated)
 		fmt.Fprintf(w, `{
@@ -45,17 +45,17 @@ func authTokenPost(t *testing.T, options tokens.AuthOptions, scope *tokens.Scope
 		ExpiresAt: time.Date(2014, 10, 2, 13, 45, 0, 0, time.UTC),
 	}
 	actual, err := tokens.Create(context.TODO(), &client, &options).Extract()
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, expected, actual)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, expected, actual)
 }
 
 func authTokenPostErr(t *testing.T, options tokens.AuthOptions, scope *tokens.Scope, includeToken bool, expectedErr error) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 
 	client := gophercloud.ServiceClient{
 		ProviderClient: &gophercloud.ProviderClient{},
-		Endpoint:       testhelper.Endpoint(),
+		Endpoint:       th.Endpoint(),
 	}
 	if includeToken {
 		client.TokenID = "abcdef123456"
@@ -303,8 +303,8 @@ func TestCreateSystemScope(t *testing.T) {
 }
 
 func TestCreateUserIDPasswordTrustID(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 
 	requestJSON := `{
 		"auth": {
@@ -362,11 +362,11 @@ func TestCreateUserIDPasswordTrustID(t *testing.T) {
 			}
 		}
 	}`
-	testhelper.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "POST")
-		testhelper.TestHeader(t, r, "Content-Type", "application/json")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestJSONRequest(t, r, requestJSON)
+	th.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "POST")
+		th.TestHeader(t, r, "Content-Type", "application/json")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestJSONRequest(t, r, requestJSON)
 
 		w.WriteHeader(http.StatusCreated)
 		fmt.Fprintf(w, responseJSON)
@@ -389,7 +389,7 @@ func TestCreateUserIDPasswordTrustID(t *testing.T) {
 	expectedToken := &tokens.Token{
 		ExpiresAt: time.Date(2024, 02, 28, 12, 10, 39, 0, time.UTC),
 	}
-	testhelper.AssertDeepEquals(t, expectedToken, token)
+	th.AssertDeepEquals(t, expectedToken, token)
 
 	trust, err := rsp.ExtractTrust()
 	if err != nil {
@@ -405,7 +405,7 @@ func TestCreateUserIDPasswordTrustID(t *testing.T) {
 			ID: "c88693b7c81c408e9084ac1e51082bfb",
 		},
 	}
-	testhelper.AssertDeepEquals(t, expectedTrust, trust)
+	th.AssertDeepEquals(t, expectedTrust, trust)
 }
 
 func TestCreateApplicationCredentialIDAndSecret(t *testing.T) {
@@ -513,15 +513,15 @@ func TestCreatePasswordTOTPProjectNameAndDomainNameScope(t *testing.T) {
 }
 
 func TestCreateExtractsTokenFromResponse(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 
 	client := gophercloud.ServiceClient{
 		ProviderClient: &gophercloud.ProviderClient{},
-		Endpoint:       testhelper.Endpoint(),
+		Endpoint:       th.Endpoint(),
 	}
 
-	testhelper.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("X-Subject-Token", "aaa111")
 
 		w.WriteHeader(http.StatusCreated)
@@ -652,22 +652,22 @@ func TestCreateFailureEmptyScope(t *testing.T) {
 */
 
 func TestGetRequest(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 
 	client := gophercloud.ServiceClient{
 		ProviderClient: &gophercloud.ProviderClient{
 			TokenID: "12345abcdef",
 		},
-		Endpoint: testhelper.Endpoint(),
+		Endpoint: th.Endpoint(),
 	}
 
-	testhelper.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeaderUnset(t, r, "Content-Type")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", "12345abcdef")
-		testhelper.TestHeader(t, r, "X-Subject-Token", "abcdef12345")
+	th.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeaderUnset(t, r, "Content-Type")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", "12345abcdef")
+		th.TestHeader(t, r, "X-Subject-Token", "abcdef12345")
 
 		w.WriteHeader(http.StatusOK)
 		fmt.Fprintf(w, `
@@ -691,15 +691,15 @@ func prepareAuthTokenHandler(t *testing.T, expectedMethod string, status int) go
 		ProviderClient: &gophercloud.ProviderClient{
 			TokenID: "12345abcdef",
 		},
-		Endpoint: testhelper.Endpoint(),
+		Endpoint: th.Endpoint(),
 	}
 
-	testhelper.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, expectedMethod)
-		testhelper.TestHeaderUnset(t, r, "Content-Type")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", "12345abcdef")
-		testhelper.TestHeader(t, r, "X-Subject-Token", "abcdef12345")
+	th.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, expectedMethod)
+		th.TestHeaderUnset(t, r, "Content-Type")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", "12345abcdef")
+		th.TestHeader(t, r, "X-Subject-Token", "abcdef12345")
 
 		w.WriteHeader(status)
 	})
@@ -708,8 +708,8 @@ func prepareAuthTokenHandler(t *testing.T, expectedMethod string, status int) go
 }
 
 func TestValidateRequestSuccessful(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	client := prepareAuthTokenHandler(t, "HEAD", http.StatusNoContent)
 
 	ok, err := tokens.Validate(context.TODO(), &client, "abcdef12345")
@@ -723,8 +723,8 @@ func TestValidateRequestSuccessful(t *testing.T) {
 }
 
 func TestValidateRequestFailure(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	client := prepareAuthTokenHandler(t, "HEAD", http.StatusNotFound)
 
 	ok, err := tokens.Validate(context.TODO(), &client, "abcdef12345")
@@ -738,8 +738,8 @@ func TestValidateRequestFailure(t *testing.T) {
 }
 
 func TestValidateRequestError(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	client := prepareAuthTokenHandler(t, "HEAD", http.StatusMethodNotAllowed)
 
 	_, err := tokens.Validate(context.TODO(), &client, "abcdef12345")
@@ -749,17 +749,17 @@ func TestValidateRequestError(t *testing.T) {
 }
 
 func TestRevokeRequestSuccessful(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	client := prepareAuthTokenHandler(t, "DELETE", http.StatusNoContent)
 
 	res := tokens.Revoke(context.TODO(), &client, "abcdef12345")
-	testhelper.AssertNoErr(t, res.Err)
+	th.AssertNoErr(t, res.Err)
 }
 
 func TestRevokeRequestError(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	client := prepareAuthTokenHandler(t, "DELETE", http.StatusNotFound)
 
 	res := tokens.Revoke(context.TODO(), &client, "abcdef12345")
@@ -769,20 +769,20 @@ func TestRevokeRequestError(t *testing.T) {
 }
 
 func TestNoTokenInResponse(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 
 	client := gophercloud.ServiceClient{
 		ProviderClient: &gophercloud.ProviderClient{},
-		Endpoint:       testhelper.Endpoint(),
+		Endpoint:       th.Endpoint(),
 	}
 
-	testhelper.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusCreated)
 		fmt.Fprintf(w, `{}`)
 	})
 
 	options := tokens.AuthOptions{UserID: "me", Password: "squirrel!"}
 	_, err := tokens.Create(context.TODO(), &client, &options).Extract()
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 }
diff --git a/openstack/identity/v3/tokens/testing/results_test.go b/openstack/identity/v3/tokens/testing/results_test.go
index e142ac9c57..c45581ffde 100644
--- a/openstack/identity/v3/tokens/testing/results_test.go
+++ b/openstack/identity/v3/tokens/testing/results_test.go
@@ -3,59 +3,59 @@ package testing
 import (
 	"testing"
 
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
 func TestExtractToken(t *testing.T) {
 	result := getGetResult(t)
 
 	token, err := result.ExtractToken()
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
-	testhelper.CheckDeepEquals(t, &ExpectedToken, token)
+	th.CheckDeepEquals(t, &ExpectedToken, token)
 }
 
 func TestExtractCatalog(t *testing.T) {
 	result := getGetResult(t)
 
 	catalog, err := result.ExtractServiceCatalog()
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
-	testhelper.CheckDeepEquals(t, &ExpectedServiceCatalog, catalog)
+	th.CheckDeepEquals(t, &ExpectedServiceCatalog, catalog)
 }
 
 func TestExtractUser(t *testing.T) {
 	result := getGetResult(t)
 
 	user, err := result.ExtractUser()
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
-	testhelper.CheckDeepEquals(t, &ExpectedUser, user)
+	th.CheckDeepEquals(t, &ExpectedUser, user)
 }
 
 func TestExtractRoles(t *testing.T) {
 	result := getGetResult(t)
 
 	roles, err := result.ExtractRoles()
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
-	testhelper.CheckDeepEquals(t, ExpectedRoles, roles)
+	th.CheckDeepEquals(t, ExpectedRoles, roles)
 }
 
 func TestExtractProject(t *testing.T) {
 	result := getGetResult(t)
 
 	project, err := result.ExtractProject()
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
-	testhelper.CheckDeepEquals(t, &ExpectedProject, project)
+	th.CheckDeepEquals(t, &ExpectedProject, project)
 }
 
 func TestExtractDomain(t *testing.T) {
 	result := getGetDomainResult(t)
 
 	domain, err := result.ExtractDomain()
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
-	testhelper.CheckDeepEquals(t, &ExpectedDomain, domain)
+	th.CheckDeepEquals(t, &ExpectedDomain, domain)
 }
diff --git a/openstack/identity/v3/trusts/testing/fixtures_test.go b/openstack/identity/v3/trusts/testing/fixtures_test.go
index 19ede76569..6cc9a8a7d1 100644
--- a/openstack/identity/v3/trusts/testing/fixtures_test.go
+++ b/openstack/identity/v3/trusts/testing/fixtures_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/trusts"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
@@ -201,37 +201,37 @@ var ExpectedTrustRolesSlice = []trusts.Role{FirstRole, SecondRole}
 // HandleCreateTrust creates an HTTP handler at `/OS-TRUST/trusts` on the
 // test handler mux that tests trust creation.
 func HandleCreateTrust(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-TRUST/trusts", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "POST")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
-		testhelper.TestJSONRequest(t, r, CreateRequest)
+	th.Mux.HandleFunc("/OS-TRUST/trusts", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "POST")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
 		_, err := fmt.Fprintf(w, CreateResponse)
-		testhelper.AssertNoErr(t, err)
+		th.AssertNoErr(t, err)
 	})
 }
 
 // HandleCreateTrustNoExpire creates an HTTP handler at `/OS-TRUST/trusts` on the
 // test handler mux that tests trust creation.
 func HandleCreateTrustNoExpire(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-TRUST/trusts", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "POST")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
-		testhelper.TestJSONRequest(t, r, CreateRequestNoExpire)
+	th.Mux.HandleFunc("/OS-TRUST/trusts", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "POST")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+		th.TestJSONRequest(t, r, CreateRequestNoExpire)
 
 		w.WriteHeader(http.StatusCreated)
 		_, err := fmt.Fprintf(w, CreateResponseNoExpire)
-		testhelper.AssertNoErr(t, err)
+		th.AssertNoErr(t, err)
 	})
 }
 
 // HandleDeleteUserSuccessfully creates an HTTP handler at `/users` on the
 // test handler mux that tests user deletion.
 func HandleDeleteTrust(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-TRUST/trusts/3422b7c113894f5d90665e1a79655e23", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "DELETE")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/OS-TRUST/trusts/3422b7c113894f5d90665e1a79655e23", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "DELETE")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.WriteHeader(http.StatusNoContent)
 	})
@@ -240,10 +240,10 @@ func HandleDeleteTrust(t *testing.T) {
 // HandleGetTrustSuccessfully creates an HTTP handler at `/OS-TRUST/trusts` on the
 // test handler mux that responds with a single trusts.
 func HandleGetTrustSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-TRUST/trusts/987fe8", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/OS-TRUST/trusts/987fe8", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -310,10 +310,10 @@ var ExpectedTrustsSlice = []trusts.Trust{FirstTrust, SecondTrust}
 // HandleListTrustsSuccessfully creates an HTTP handler at `/OS-TRUST/trusts` on the
 // test handler mux that responds with a list of two trusts.
 func HandleListTrustsSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-TRUST/trusts", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/OS-TRUST/trusts", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -324,10 +324,10 @@ func HandleListTrustsSuccessfully(t *testing.T) {
 // HandleListTrustRolesSuccessfully creates an HTTP handler at `/OS-TRUST/trusts/987fe8/roles` on the
 // test handler mux that responds with a list trust roles.
 func HandleListTrustRolesSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-TRUST/trusts/987fe8/roles", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/OS-TRUST/trusts/987fe8/roles", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -338,10 +338,10 @@ func HandleListTrustRolesSuccessfully(t *testing.T) {
 // HandleGetTrustRoleSuccessfully creates an HTTP handler at `/OS-TRUST/trusts/987fe8/roles/c1648e` on the
 // test handler mux that responds with a trust role details.
 func HandleGetTrustRoleSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-TRUST/trusts/987fe8/roles/c1648e", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/OS-TRUST/trusts/987fe8/roles/c1648e", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -352,10 +352,10 @@ func HandleGetTrustRoleSuccessfully(t *testing.T) {
 // HandleCheckTrustRoleSuccessfully creates an HTTP handler at `/OS-TRUST/trusts/987fe8/roles/c1648e` on the
 // test handler mux that responds with a list trust roles.
 func HandleCheckTrustRoleSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/OS-TRUST/trusts/987fe8/roles/c1648e", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "HEAD")
-		testhelper.TestHeader(t, r, "Accept", "application/json")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/OS-TRUST/trusts/987fe8/roles/c1648e", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "HEAD")
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.WriteHeader(http.StatusOK)
 	})
diff --git a/openstack/sharedfilesystems/v2/schedulerstats/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/schedulerstats/testing/fixtures_test.go
index acdd04d53f..88c4b31203 100644
--- a/openstack/sharedfilesystems/v2/schedulerstats/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/schedulerstats/testing/fixtures_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/gophercloud/gophercloud/v2/openstack/sharedfilesystems/v2/schedulerstats"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
@@ -265,9 +265,9 @@ var (
 )
 
 func HandlePoolsListSuccessfully(t *testing.T) {
-	testhelper.Mux.HandleFunc("/scheduler-stats/pools", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/scheduler-stats/pools", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 
@@ -277,9 +277,9 @@ func HandlePoolsListSuccessfully(t *testing.T) {
 		fmt.Fprintf(w, PoolsListBody)
 
 	})
-	testhelper.Mux.HandleFunc("/scheduler-stats/pools/detail", func(w http.ResponseWriter, r *http.Request) {
-		testhelper.TestMethod(t, r, "GET")
-		testhelper.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+	th.Mux.HandleFunc("/scheduler-stats/pools/detail", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
 
diff --git a/openstack/sharedfilesystems/v2/schedulerstats/testing/requests_test.go b/openstack/sharedfilesystems/v2/schedulerstats/testing/requests_test.go
index 5c2ff36ad9..d6b826ed74 100644
--- a/openstack/sharedfilesystems/v2/schedulerstats/testing/requests_test.go
+++ b/openstack/sharedfilesystems/v2/schedulerstats/testing/requests_test.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2/openstack/sharedfilesystems/v2/schedulerstats"
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
 func TestListPoolsDetail(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandlePoolsListSuccessfully(t)
 
 	pages := 0
@@ -20,20 +20,20 @@ func TestListPoolsDetail(t *testing.T) {
 		pages++
 
 		actual, err := schedulerstats.ExtractPools(page)
-		testhelper.AssertNoErr(t, err)
+		th.AssertNoErr(t, err)
 
 		if len(actual) != 4 {
 			t.Fatalf("Expected 4 backends, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, PoolFake1, actual[0])
-		testhelper.CheckDeepEquals(t, PoolFake2, actual[1])
-		testhelper.CheckDeepEquals(t, PoolFake3, actual[2])
-		testhelper.CheckDeepEquals(t, PoolFake4, actual[3])
+		th.CheckDeepEquals(t, PoolFake1, actual[0])
+		th.CheckDeepEquals(t, PoolFake2, actual[1])
+		th.CheckDeepEquals(t, PoolFake3, actual[2])
+		th.CheckDeepEquals(t, PoolFake4, actual[3])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
@@ -44,20 +44,20 @@ func TestListPoolsDetail(t *testing.T) {
 		pages++
 
 		actual, err := schedulerstats.ExtractPools(page)
-		testhelper.AssertNoErr(t, err)
+		th.AssertNoErr(t, err)
 
 		if len(actual) != 4 {
 			t.Fatalf("Expected 4 backends, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, PoolDetailFake1, actual[0])
-		testhelper.CheckDeepEquals(t, PoolDetailFake2, actual[1])
-		testhelper.CheckDeepEquals(t, PoolDetailFake3, actual[2])
-		testhelper.CheckDeepEquals(t, PoolDetailFake4, actual[3])
+		th.CheckDeepEquals(t, PoolDetailFake1, actual[0])
+		th.CheckDeepEquals(t, PoolDetailFake2, actual[1])
+		th.CheckDeepEquals(t, PoolDetailFake3, actual[2])
+		th.CheckDeepEquals(t, PoolDetailFake4, actual[3])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
diff --git a/openstack/sharedfilesystems/v2/services/testing/requests_test.go b/openstack/sharedfilesystems/v2/services/testing/requests_test.go
index 16607415b6..d4845ca09e 100644
--- a/openstack/sharedfilesystems/v2/services/testing/requests_test.go
+++ b/openstack/sharedfilesystems/v2/services/testing/requests_test.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2/openstack/sharedfilesystems/v2/services"
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
 func TestListServices(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	HandleListSuccessfully(t)
 
 	pages := 0
@@ -27,13 +27,13 @@ func TestListServices(t *testing.T) {
 		if len(actual) != 2 {
 			t.Fatalf("Expected 2 services, got %d", len(actual))
 		}
-		testhelper.CheckDeepEquals(t, FirstFakeService, actual[0])
-		testhelper.CheckDeepEquals(t, SecondFakeService, actual[1])
+		th.CheckDeepEquals(t, FirstFakeService, actual[0])
+		th.CheckDeepEquals(t, SecondFakeService, actual[1])
 
 		return true, nil
 	})
 
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	if pages != 1 {
 		t.Errorf("Expected 1 page, saw %d", pages)
diff --git a/openstack/utils/testing/choose_version_test.go b/openstack/utils/testing/choose_version_test.go
index 36d8ac37ec..c237e4e036 100644
--- a/openstack/utils/testing/choose_version_test.go
+++ b/openstack/utils/testing/choose_version_test.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/gophercloud/gophercloud/v2"
 	"github.com/gophercloud/gophercloud/v2/openstack/utils"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
 func setupVersionHandler() {
-	testhelper.Mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, `
 			{
 				"versions": {
@@ -35,10 +35,10 @@ func setupVersionHandler() {
 					]
 				}
 			}
-		`, testhelper.Server.URL, testhelper.Server.URL)
+		`, th.Server.URL, th.Server.URL)
 	})
 	// Compute v2.1 API
-	testhelper.Mux.HandleFunc("/compute/v2.1/", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/compute/v2.1/", func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, `
 			{
 				"version": {
@@ -66,10 +66,10 @@ func setupVersionHandler() {
 					]
 				}
 			}
-		`, testhelper.Server.URL)
+		`, th.Server.URL)
 	})
 	// Compute v2 API
-	testhelper.Mux.HandleFunc("/compute/v2/", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/compute/v2/", func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, `
 			{
 				"version": {
@@ -97,10 +97,10 @@ func setupVersionHandler() {
 					]
 				}
 			}
-		`, testhelper.Server.URL)
+		`, th.Server.URL)
 	})
 	// Ironic API
-	testhelper.Mux.HandleFunc("/ironic/v1/", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/ironic/v1/", func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, `
 		{
 			"name": "OpenStack Ironic API",
@@ -132,10 +132,10 @@ func setupVersionHandler() {
 				}
 			]
 		}
-		`, testhelper.Server.URL, testhelper.Server.URL)
+		`, th.Server.URL, th.Server.URL)
 	})
 	// Ironic multi-version
-	testhelper.Mux.HandleFunc("/ironic/v1.2/", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/ironic/v1.2/", func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, `
 		{
 			"name": "OpenStack Ironic API",
@@ -179,20 +179,20 @@ func setupVersionHandler() {
 				}
 			]
 		}
-		`, testhelper.Server.URL, testhelper.Server.URL, testhelper.Server.URL)
+		`, th.Server.URL, th.Server.URL, th.Server.URL)
 	})
 }
 
 func TestChooseVersion(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	setupVersionHandler()
 
 	v2 := &utils.Version{ID: "v2.0", Priority: 2, Suffix: "blarg"}
 	v3 := &utils.Version{ID: "v3.0", Priority: 3, Suffix: "hargl"}
 
 	c := &gophercloud.ProviderClient{
-		IdentityBase:     testhelper.Endpoint(),
+		IdentityBase:     th.Endpoint(),
 		IdentityEndpoint: "",
 	}
 	v, endpoint, err := utils.ChooseVersion(context.TODO(), c, []*utils.Version{v2, v3})
@@ -205,23 +205,23 @@ func TestChooseVersion(t *testing.T) {
 		t.Errorf("Expected %#v to win, but %#v did instead", v3, v)
 	}
 
-	expected := testhelper.Endpoint() + "v3.0/"
+	expected := th.Endpoint() + "v3.0/"
 	if endpoint != expected {
 		t.Errorf("Expected endpoint [%s], but was [%s] instead", expected, endpoint)
 	}
 }
 
 func TestChooseVersionOpinionatedLink(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	setupVersionHandler()
 
 	v2 := &utils.Version{ID: "v2.0", Priority: 2, Suffix: "nope"}
 	v3 := &utils.Version{ID: "v3.0", Priority: 3, Suffix: "northis"}
 
 	c := &gophercloud.ProviderClient{
-		IdentityBase:     testhelper.Endpoint(),
-		IdentityEndpoint: testhelper.Endpoint() + "v2.0/",
+		IdentityBase:     th.Endpoint(),
+		IdentityEndpoint: th.Endpoint() + "v2.0/",
 	}
 	v, endpoint, err := utils.ChooseVersion(context.TODO(), c, []*utils.Version{v2, v3})
 	if err != nil {
@@ -232,22 +232,22 @@ func TestChooseVersionOpinionatedLink(t *testing.T) {
 		t.Errorf("Expected %#v to win, but %#v did instead", v2, v)
 	}
 
-	expected := testhelper.Endpoint() + "v2.0/"
+	expected := th.Endpoint() + "v2.0/"
 	if endpoint != expected {
 		t.Errorf("Expected endpoint [%s], but was [%s] instead", expected, endpoint)
 	}
 }
 
 func TestChooseVersionFromSuffix(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 
 	v2 := &utils.Version{ID: "v2.0", Priority: 2, Suffix: "/v2.0/"}
 	v3 := &utils.Version{ID: "v3.0", Priority: 3, Suffix: "/v3.0/"}
 
 	c := &gophercloud.ProviderClient{
-		IdentityBase:     testhelper.Endpoint(),
-		IdentityEndpoint: testhelper.Endpoint() + "v2.0/",
+		IdentityBase:     th.Endpoint(),
+		IdentityEndpoint: th.Endpoint() + "v2.0/",
 	}
 	v, endpoint, err := utils.ChooseVersion(context.TODO(), c, []*utils.Version{v2, v3})
 	if err != nil {
@@ -258,7 +258,7 @@ func TestChooseVersionFromSuffix(t *testing.T) {
 		t.Errorf("Expected %#v to win, but %#v did instead", v2, v)
 	}
 
-	expected := testhelper.Endpoint() + "v2.0/"
+	expected := th.Endpoint() + "v2.0/"
 	if endpoint != expected {
 		t.Errorf("Expected endpoint [%s], but was [%s] instead", expected, endpoint)
 	}
@@ -272,33 +272,33 @@ type getSupportedServiceMicroversions struct {
 }
 
 func TestGetSupportedVersions(t *testing.T) {
-	testhelper.SetupHTTP()
-	defer testhelper.TeardownHTTP()
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
 	setupVersionHandler()
 
 	tests := []getSupportedServiceMicroversions{
 		{
 			// v2 does not support microversions and returns error
-			Endpoint:    testhelper.Endpoint() + "compute/v2/",
+			Endpoint:    th.Endpoint() + "compute/v2/",
 			ExpectedMax: "",
 			ExpectedMin: "",
 			ExpectedErr: true,
 		},
 		{
-			Endpoint:    testhelper.Endpoint() + "compute/v2.1/",
+			Endpoint:    th.Endpoint() + "compute/v2.1/",
 			ExpectedMax: "2.90",
 			ExpectedMin: "2.1",
 			ExpectedErr: false,
 		},
 		{
-			Endpoint:    testhelper.Endpoint() + "ironic/v1/",
+			Endpoint:    th.Endpoint() + "ironic/v1/",
 			ExpectedMax: "1.87",
 			ExpectedMin: "1.1",
 			ExpectedErr: false,
 		},
 		{
 			// This endpoint returns multiple versions, which is not supported
-			Endpoint:    testhelper.Endpoint() + "ironic/v1.2/",
+			Endpoint:    th.Endpoint() + "ironic/v1.2/",
 			ExpectedMax: "not-relevant",
 			ExpectedMin: "not-relevant",
 			ExpectedErr: true,
@@ -307,8 +307,8 @@ func TestGetSupportedVersions(t *testing.T) {
 
 	for _, test := range tests {
 		c := &gophercloud.ProviderClient{
-			IdentityBase:     testhelper.Endpoint(),
-			IdentityEndpoint: testhelper.Endpoint() + "v2.0/",
+			IdentityBase:     th.Endpoint(),
+			IdentityEndpoint: th.Endpoint() + "v2.0/",
 		}
 
 		client := &gophercloud.ServiceClient{
diff --git a/pagination/testing/linked_test.go b/pagination/testing/linked_test.go
index 83673f19b8..25166ad861 100644
--- a/pagination/testing/linked_test.go
+++ b/pagination/testing/linked_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
 // LinkedPager sample and test cases.
@@ -31,19 +31,19 @@ func ExtractLinkedInts(r pagination.Page) ([]int, error) {
 }
 
 func createLinked() pagination.Pager {
-	testhelper.SetupHTTP()
+	th.SetupHTTP()
 
-	testhelper.Mux.HandleFunc("/page1", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/page1", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{ "ints": [1, 2, 3], "links": { "next": "%s/page2" } }`, testhelper.Server.URL)
+		fmt.Fprintf(w, `{ "ints": [1, 2, 3], "links": { "next": "%s/page2" } }`, th.Server.URL)
 	})
 
-	testhelper.Mux.HandleFunc("/page2", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/page2", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{ "ints": [4, 5, 6], "links": { "next": "%s/page3" } }`, testhelper.Server.URL)
+		fmt.Fprintf(w, `{ "ints": [4, 5, 6], "links": { "next": "%s/page3" } }`, th.Server.URL)
 	})
 
-	testhelper.Mux.HandleFunc("/page3", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/page3", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Content-Type", "application/json")
 		fmt.Fprintf(w, `{ "ints": [7, 8, 9], "links": { "next": null } }`)
 	})
@@ -54,12 +54,12 @@ func createLinked() pagination.Pager {
 		return LinkedPageResult{pagination.LinkedPageBase{PageResult: r}}
 	}
 
-	return pagination.NewPager(client, testhelper.Server.URL+"/page1", createPage)
+	return pagination.NewPager(client, th.Server.URL+"/page1", createPage)
 }
 
 func TestEnumerateLinked(t *testing.T) {
 	pager := createLinked()
-	defer testhelper.TeardownHTTP()
+	defer th.TeardownHTTP()
 
 	callCount := 0
 	err := pager.EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
@@ -101,13 +101,13 @@ func TestEnumerateLinked(t *testing.T) {
 
 func TestAllPagesLinked(t *testing.T) {
 	pager := createLinked()
-	defer testhelper.TeardownHTTP()
+	defer th.TeardownHTTP()
 
 	page, err := pager.AllPages(context.TODO())
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	expected := []int{1, 2, 3, 4, 5, 6, 7, 8, 9}
 	actual, err := ExtractLinkedInts(page)
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, expected, actual)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, expected, actual)
 }
diff --git a/pagination/testing/marker_test.go b/pagination/testing/marker_test.go
index a1084ac12f..45c943e5b7 100644
--- a/pagination/testing/marker_test.go
+++ b/pagination/testing/marker_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
 // MarkerPager sample and test cases.
@@ -37,9 +37,9 @@ func (r MarkerPageResult) LastMarker() (string, error) {
 }
 
 func createMarkerPaged(t *testing.T) pagination.Pager {
-	testhelper.SetupHTTP()
+	th.SetupHTTP()
 
-	testhelper.Mux.HandleFunc("/page", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/page", func(w http.ResponseWriter, r *http.Request) {
 		if err := r.ParseForm(); err != nil {
 			t.Errorf("Failed to parse request form %v", err)
 		}
@@ -66,7 +66,7 @@ func createMarkerPaged(t *testing.T) pagination.Pager {
 		return p
 	}
 
-	return pagination.NewPager(client, testhelper.Server.URL+"/page", createPage)
+	return pagination.NewPager(client, th.Server.URL+"/page", createPage)
 }
 
 func ExtractMarkerStrings(page pagination.Page) ([]string, error) {
@@ -83,7 +83,7 @@ func ExtractMarkerStrings(page pagination.Page) ([]string, error) {
 
 func TestEnumerateMarker(t *testing.T) {
 	pager := createMarkerPaged(t)
-	defer testhelper.TeardownHTTP()
+	defer th.TeardownHTTP()
 
 	callCount := 0
 	err := pager.EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
@@ -107,24 +107,24 @@ func TestEnumerateMarker(t *testing.T) {
 			return false, nil
 		}
 
-		testhelper.CheckDeepEquals(t, expected, actual)
+		th.CheckDeepEquals(t, expected, actual)
 
 		callCount++
 		return true, nil
 	})
-	testhelper.AssertNoErr(t, err)
-	testhelper.AssertEquals(t, callCount, 3)
+	th.AssertNoErr(t, err)
+	th.AssertEquals(t, callCount, 3)
 }
 
 func TestAllPagesMarker(t *testing.T) {
 	pager := createMarkerPaged(t)
-	defer testhelper.TeardownHTTP()
+	defer th.TeardownHTTP()
 
 	page, err := pager.AllPages(context.TODO())
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	expected := []string{"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg", "hhh", "iii"}
 	actual, err := ExtractMarkerStrings(page)
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, expected, actual)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, expected, actual)
 }
diff --git a/pagination/testing/pagination_test.go b/pagination/testing/pagination_test.go
index b730676d4e..e10ef56847 100644
--- a/pagination/testing/pagination_test.go
+++ b/pagination/testing/pagination_test.go
@@ -2,12 +2,12 @@ package testing
 
 import (
 	"github.com/gophercloud/gophercloud/v2"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
 func createClient() *gophercloud.ServiceClient {
 	return &gophercloud.ServiceClient{
 		ProviderClient: &gophercloud.ProviderClient{TokenID: "abc123"},
-		Endpoint:       testhelper.Endpoint(),
+		Endpoint:       th.Endpoint(),
 	}
 }
diff --git a/pagination/testing/single_test.go b/pagination/testing/single_test.go
index 21daedff0a..6bcd930cb2 100644
--- a/pagination/testing/single_test.go
+++ b/pagination/testing/single_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/gophercloud/gophercloud/v2/pagination"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
 // SinglePage sample and test cases.
@@ -33,10 +33,10 @@ func ExtractSingleInts(r pagination.Page) ([]int, error) {
 }
 
 func setupSinglePaged() pagination.Pager {
-	testhelper.SetupHTTP()
+	th.SetupHTTP()
 	client := createClient()
 
-	testhelper.Mux.HandleFunc("/only", func(w http.ResponseWriter, r *http.Request) {
+	th.Mux.HandleFunc("/only", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Content-Type", "application/json")
 		fmt.Fprintf(w, `{ "ints": [1, 2, 3] }`)
 	})
@@ -45,36 +45,36 @@ func setupSinglePaged() pagination.Pager {
 		return SinglePageResult{pagination.SinglePageBase(r)}
 	}
 
-	return pagination.NewPager(client, testhelper.Server.URL+"/only", createPage)
+	return pagination.NewPager(client, th.Server.URL+"/only", createPage)
 }
 
 func TestEnumerateSinglePaged(t *testing.T) {
 	callCount := 0
 	pager := setupSinglePaged()
-	defer testhelper.TeardownHTTP()
+	defer th.TeardownHTTP()
 
 	err := pager.EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
 		callCount++
 
 		expected := []int{1, 2, 3}
 		actual, err := ExtractSingleInts(page)
-		testhelper.AssertNoErr(t, err)
-		testhelper.CheckDeepEquals(t, expected, actual)
+		th.AssertNoErr(t, err)
+		th.CheckDeepEquals(t, expected, actual)
 		return true, nil
 	})
-	testhelper.CheckNoErr(t, err)
-	testhelper.CheckEquals(t, 1, callCount)
+	th.CheckNoErr(t, err)
+	th.CheckEquals(t, 1, callCount)
 }
 
 func TestAllPagesSingle(t *testing.T) {
 	pager := setupSinglePaged()
-	defer testhelper.TeardownHTTP()
+	defer th.TeardownHTTP()
 
 	page, err := pager.AllPages(context.TODO())
-	testhelper.AssertNoErr(t, err)
+	th.AssertNoErr(t, err)
 
 	expected := []int{1, 2, 3}
 	actual, err := ExtractSingleInts(page)
-	testhelper.AssertNoErr(t, err)
-	testhelper.CheckDeepEquals(t, expected, actual)
+	th.AssertNoErr(t, err)
+	th.CheckDeepEquals(t, expected, actual)
 }
diff --git a/testhelper/client/fake.go b/testhelper/client/fake.go
index 6e25f759d7..29514b0a65 100644
--- a/testhelper/client/fake.go
+++ b/testhelper/client/fake.go
@@ -2,7 +2,7 @@ package client
 
 import (
 	"github.com/gophercloud/gophercloud/v2"
-	"github.com/gophercloud/gophercloud/v2/testhelper"
+	th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
 // Fake token to use.
@@ -12,6 +12,6 @@ const TokenID = "cbc36478b0bd8e67e89469c7749d4127"
 func ServiceClient() *gophercloud.ServiceClient {
 	return &gophercloud.ServiceClient{
 		ProviderClient: &gophercloud.ProviderClient{TokenID: TokenID},
-		Endpoint:       testhelper.Endpoint(),
+		Endpoint:       th.Endpoint(),
 	}
 }

From fd05e46ab13c879b5171092a34a4f48d12fcde35 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Thu, 30 May 2024 23:54:21 +0100
Subject: [PATCH 23/32] tests: Add AssertTypeOf helper

Better errors messages since we see the different types.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 testhelper/convenience.go    | 10 ++++++++++
 testing/auth_options_test.go |  3 +--
 testing/params_test.go       |  3 +--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/testhelper/convenience.go b/testhelper/convenience.go
index 3b3e63979d..1ea727045f 100644
--- a/testhelper/convenience.go
+++ b/testhelper/convenience.go
@@ -232,6 +232,16 @@ func CheckEquals(t *testing.T, expected, actual any) {
 	}
 }
 
+// AssertDeepEquals - like Equals - performs a comparison - but on more complex
+// structures that requires deeper inspection
+func AssertTypeEquals(t *testing.T, expected, actual any) {
+	t.Helper()
+
+	if reflect.TypeOf(expected) != reflect.TypeOf(actual) {
+		logFatal(t, fmt.Sprintf("expected %s but got %s", green(expected), yellow(actual)))
+	}
+}
+
 // AssertDeepEquals - like Equals - performs a comparison - but on more complex
 // structures that requires deeper inspection
 func AssertDeepEquals(t *testing.T, expected, actual any) {
diff --git a/testing/auth_options_test.go b/testing/auth_options_test.go
index 1f9b230b50..fc2c936f89 100644
--- a/testing/auth_options_test.go
+++ b/testing/auth_options_test.go
@@ -1,7 +1,6 @@
 package testing
 
 import (
-	"reflect"
 	"testing"
 
 	"github.com/gophercloud/gophercloud/v2"
@@ -199,6 +198,6 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 	}
 	for _, failCase := range failCases {
 		_, err := failCase.opts.ToTokenV3ScopeMap()
-		th.AssertDeepEquals(t, reflect.TypeOf(failCase.expected), reflect.TypeOf(err))
+		th.AssertTypeEquals(t, failCase.expected, err)
 	}
 }
diff --git a/testing/params_test.go b/testing/params_test.go
index 9e74bdd9ea..057a23b58a 100644
--- a/testing/params_test.go
+++ b/testing/params_test.go
@@ -2,7 +2,6 @@ package testing
 
 import (
 	"net/url"
-	"reflect"
 	"testing"
 	"time"
 
@@ -255,7 +254,7 @@ func TestBuildRequestBody(t *testing.T) {
 
 	for _, failCase := range failCases {
 		_, err := gophercloud.BuildRequestBody(failCase.opts, "auth")
-		th.AssertDeepEquals(t, reflect.TypeOf(failCase.expected), reflect.TypeOf(err))
+		th.AssertTypeEquals(t, failCase.expected, err)
 	}
 
 	createdAt := time.Date(2018, 1, 4, 10, 00, 12, 0, time.UTC)

From 48356f113360f80f8e52660b6c2b7af80c25c307 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Fri, 31 May 2024 00:03:43 +0100
Subject: [PATCH 24/32] testing: Set test case names

Make this a little easier to understand failures when they occur.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 testing/auth_options_test.go | 44 ++++++++++++++++++++----------------
 testing/params_test.go       | 22 ++++++++++++++----
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/testing/auth_options_test.go b/testing/auth_options_test.go
index fc2c936f89..67b06174e6 100644
--- a/testing/auth_options_test.go
+++ b/testing/auth_options_test.go
@@ -14,11 +14,12 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 	domainName := "Default"
 
 	var successCases = []struct {
+		name     string
 		opts     gophercloud.AuthOptions
 		expected map[string]any
 	}{
-		// System-scoped
 		{
+			"System-scoped",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					System: true,
@@ -30,8 +31,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 				},
 			},
 		},
-		// Trust-scoped
 		{
+			"Trust-scoped",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					TrustID: "05144328-1f7d-46a9-a978-17eaad187077",
@@ -43,8 +44,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 				},
 			},
 		},
-		// Project-scoped (ID)
 		{
+			"Project-scoped (ID)",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					ProjectID: projectID,
@@ -56,8 +57,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 				},
 			},
 		},
-		// Project-scoped (name)
 		{
+			"Project-scoped (name)",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					ProjectName: projectName,
@@ -73,8 +74,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 				},
 			},
 		},
-		// Domain-scoped (ID)
 		{
+			"Domain-scoped (ID)",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					DomainID: domainID,
@@ -86,8 +87,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 				},
 			},
 		},
-		// Domain-scoped (name)
 		{
+			"Domain-scoped (name)",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					DomainName: domainName,
@@ -99,8 +100,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 				},
 			},
 		},
-		// Empty with project fallback (ID)
 		{
+			"Empty with project fallback (ID)",
 			gophercloud.AuthOptions{
 				TenantID: projectID,
 				Scope:    nil,
@@ -111,8 +112,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 				},
 			},
 		},
-		// Empty with project fallback (name)
 		{
+			"Empty with project fallback (name)",
 			gophercloud.AuthOptions{
 				TenantName: projectName,
 				DomainName: domainName,
@@ -127,8 +128,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 				},
 			},
 		},
-		// Empty without fallback
 		{
+			"Empty without fallback",
 			gophercloud.AuthOptions{
 				Scope: nil,
 			},
@@ -136,17 +137,20 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 		},
 	}
 	for _, successCase := range successCases {
-		actual, err := successCase.opts.ToTokenV3ScopeMap()
-		th.AssertNoErr(t, err)
-		th.AssertDeepEquals(t, successCase.expected, actual)
+		t.Run(successCase.name, func(t *testing.T) {
+			actual, err := successCase.opts.ToTokenV3ScopeMap()
+			th.AssertNoErr(t, err)
+			th.AssertDeepEquals(t, successCase.expected, actual)
+		})
 	}
 
 	var failCases = []struct {
+		name     string
 		opts     gophercloud.AuthOptions
 		expected error
 	}{
-		// Project-scoped with name but missing domain ID/name
 		{
+			"Project-scoped with name but missing domain ID/name",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					ProjectName: "admin",
@@ -154,8 +158,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 			},
 			gophercloud.ErrScopeDomainIDOrDomainName{},
 		},
-		// Project-scoped with both project name and project ID
 		{
+			"Project-scoped with both project name and project ID",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					ProjectName: "admin",
@@ -165,8 +169,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 			},
 			gophercloud.ErrScopeProjectIDOrProjectName{},
 		},
-		// Project-scoped with name and unnecessary domain ID
 		{
+			"Project-scoped with name and unnecessary domain ID",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					ProjectID: "685038cd-3c25-4faf-8f9b-78c18e503190",
@@ -175,8 +179,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 			},
 			gophercloud.ErrScopeProjectIDAlone{},
 		},
-		// Project-scoped with name and unnecessary domain name
 		{
+			"Project-scoped with name and unnecessary domain name",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					ProjectID:  "685038cd-3c25-4faf-8f9b-78c18e503190",
@@ -185,8 +189,8 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 			},
 			gophercloud.ErrScopeProjectIDAlone{},
 		},
-		// Domain-scoped with both domain name and domain ID
 		{
+			"Domain-scoped with both domain name and domain ID",
 			gophercloud.AuthOptions{
 				Scope: &gophercloud.AuthScope{
 					DomainID:   "e4b515b8-e453-49d8-9cce-4bec244fa84e",
@@ -197,7 +201,9 @@ func TestToTokenV3ScopeMap(t *testing.T) {
 		},
 	}
 	for _, failCase := range failCases {
-		_, err := failCase.opts.ToTokenV3ScopeMap()
-		th.AssertTypeEquals(t, failCase.expected, err)
+		t.Run(failCase.name, func(t *testing.T) {
+			_, err := failCase.opts.ToTokenV3ScopeMap()
+			th.AssertTypeEquals(t, failCase.expected, err)
+		})
 	}
 }
diff --git a/testing/params_test.go b/testing/params_test.go
index 057a23b58a..146fc27025 100644
--- a/testing/params_test.go
+++ b/testing/params_test.go
@@ -166,10 +166,12 @@ func TestBuildRequestBody(t *testing.T) {
 	}
 
 	var successCases = []struct {
+		name     string
 		opts     AuthOptions
 		expected map[string]any
 	}{
 		{
+			"Password",
 			AuthOptions{
 				PasswordCredentials: &PasswordCredentials{
 					Username: "me",
@@ -186,6 +188,7 @@ func TestBuildRequestBody(t *testing.T) {
 			},
 		},
 		{
+			"Token",
 			AuthOptions{
 				TokenCredentials: &TokenCredentials{
 					ID: "1234567",
@@ -202,16 +205,20 @@ func TestBuildRequestBody(t *testing.T) {
 	}
 
 	for _, successCase := range successCases {
-		actual, err := gophercloud.BuildRequestBody(successCase.opts, "auth")
-		th.AssertNoErr(t, err)
-		th.AssertDeepEquals(t, successCase.expected, actual)
+		t.Run(successCase.name, func(t *testing.T) {
+			actual, err := gophercloud.BuildRequestBody(successCase.opts, "auth")
+			th.AssertNoErr(t, err)
+			th.AssertDeepEquals(t, successCase.expected, actual)
+		})
 	}
 
 	var failCases = []struct {
+		name     string
 		opts     AuthOptions
 		expected error
 	}{
 		{
+			"Conflicting tenant name and ID",
 			AuthOptions{
 				TenantID:   "987654321",
 				TenantName: "me",
@@ -219,6 +226,7 @@ func TestBuildRequestBody(t *testing.T) {
 			gophercloud.ErrMissingInput{},
 		},
 		{
+			"Conflicting password and token auth",
 			AuthOptions{
 				TokenCredentials: &TokenCredentials{
 					ID: "1234567",
@@ -231,6 +239,7 @@ func TestBuildRequestBody(t *testing.T) {
 			gophercloud.ErrMissingInput{},
 		},
 		{
+			"Missing Username or UserID",
 			AuthOptions{
 				PasswordCredentials: &PasswordCredentials{
 					Password: "swordfish",
@@ -239,6 +248,7 @@ func TestBuildRequestBody(t *testing.T) {
 			gophercloud.ErrMissingInput{},
 		},
 		{
+			"Missing filler fields",
 			AuthOptions{
 				PasswordCredentials: &PasswordCredentials{
 					Username: "me",
@@ -253,8 +263,10 @@ func TestBuildRequestBody(t *testing.T) {
 	}
 
 	for _, failCase := range failCases {
-		_, err := gophercloud.BuildRequestBody(failCase.opts, "auth")
-		th.AssertTypeEquals(t, failCase.expected, err)
+		t.Run(failCase.name, func(t *testing.T) {
+			_, err := gophercloud.BuildRequestBody(failCase.opts, "auth")
+			th.AssertTypeEquals(t, failCase.expected, err)
+		})
 	}
 
 	createdAt := time.Date(2018, 1, 4, 10, 00, 12, 0, time.UTC)

From 596883b483733675d5a4cfefe1e4994169ad7e81 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Fri, 31 May 2024 15:25:54 +0100
Subject: [PATCH 25/32] tests: Be consistent in our generation of credentials

We were not passing through user IDs, despite our test wrappers
indicating you could user either user IDs or usernames. Similarly, we
were not always setting scope, which could cause issues when using a
project ID. Correct all issues.

We should eventually move this to another test helper but that's a job
for a later change.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 internal/acceptance/openstack/client_test.go           |  2 +-
 .../identity/v3/applicationcredentials_test.go         |  4 ++--
 .../openstack/identity/v3/credentials_test.go          |  4 ++--
 .../openstack/identity/v3/ec2credentials_test.go       |  2 +-
 .../acceptance/openstack/identity/v3/oauth1_test.go    |  2 +-
 .../acceptance/openstack/identity/v3/token_test.go     | 10 +++++++++-
 .../acceptance/openstack/identity/v3/trusts_test.go    |  7 +++++++
 7 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/internal/acceptance/openstack/client_test.go b/internal/acceptance/openstack/client_test.go
index 7902961c55..69e9a09367 100644
--- a/internal/acceptance/openstack/client_test.go
+++ b/internal/acceptance/openstack/client_test.go
@@ -56,10 +56,10 @@ func TestEC2AuthMethod(t *testing.T) {
 
 	authOptions := tokens.AuthOptions{
 		Username:   ao.Username,
+		UserID:     ao.UserID,
 		Password:   ao.Password,
 		DomainName: ao.DomainName,
 		DomainID:   ao.DomainID,
-		// We need a scope to get the token roles list
 		Scope: tokens.Scope{
 			ProjectID:   ao.TenantID,
 			ProjectName: ao.TenantName,
diff --git a/internal/acceptance/openstack/identity/v3/applicationcredentials_test.go b/internal/acceptance/openstack/identity/v3/applicationcredentials_test.go
index 1390e284a9..7a4ad01e1c 100644
--- a/internal/acceptance/openstack/identity/v3/applicationcredentials_test.go
+++ b/internal/acceptance/openstack/identity/v3/applicationcredentials_test.go
@@ -34,10 +34,10 @@ func TestApplicationCredentialsCRD(t *testing.T) {
 
 	authOptions := tokens.AuthOptions{
 		Username:   ao.Username,
+		UserID:     ao.UserID,
 		Password:   ao.Password,
 		DomainName: ao.DomainName,
 		DomainID:   ao.DomainID,
-		// We need a scope to get the token roles list
 		Scope: tokens.Scope{
 			ProjectID:   ao.TenantID,
 			ProjectName: ao.TenantName,
@@ -178,10 +178,10 @@ func TestApplicationCredentialsAccessRules(t *testing.T) {
 
 	authOptions := tokens.AuthOptions{
 		Username:   ao.Username,
+		UserID:     ao.UserID,
 		Password:   ao.Password,
 		DomainName: ao.DomainName,
 		DomainID:   ao.DomainID,
-		// We need a scope to get the token roles list
 		Scope: tokens.Scope{
 			ProjectID:   ao.TenantID,
 			ProjectName: ao.TenantName,
diff --git a/internal/acceptance/openstack/identity/v3/credentials_test.go b/internal/acceptance/openstack/identity/v3/credentials_test.go
index a1167ac647..ce0362abee 100644
--- a/internal/acceptance/openstack/identity/v3/credentials_test.go
+++ b/internal/acceptance/openstack/identity/v3/credentials_test.go
@@ -24,10 +24,10 @@ func TestCredentialsCRUD(t *testing.T) {
 
 	authOptions := tokens.AuthOptions{
 		Username:   ao.Username,
+		UserID:     ao.UserID,
 		Password:   ao.Password,
 		DomainName: ao.DomainName,
 		DomainID:   ao.DomainID,
-		// We need a scope to get the token roles list
 		Scope: tokens.Scope{
 			ProjectID:   ao.TenantID,
 			ProjectName: ao.TenantName,
@@ -101,10 +101,10 @@ func TestCredentialsValidateS3(t *testing.T) {
 
 	authOptions := tokens.AuthOptions{
 		Username:   ao.Username,
+		UserID:     ao.UserID,
 		Password:   ao.Password,
 		DomainName: ao.DomainName,
 		DomainID:   ao.DomainID,
-		// We need a scope to get the token roles list
 		Scope: tokens.Scope{
 			ProjectID:   ao.TenantID,
 			ProjectName: ao.TenantName,
diff --git a/internal/acceptance/openstack/identity/v3/ec2credentials_test.go b/internal/acceptance/openstack/identity/v3/ec2credentials_test.go
index 6500aa6f0c..7f27f51ed4 100644
--- a/internal/acceptance/openstack/identity/v3/ec2credentials_test.go
+++ b/internal/acceptance/openstack/identity/v3/ec2credentials_test.go
@@ -23,10 +23,10 @@ func TestEC2CredentialsCRD(t *testing.T) {
 
 	authOptions := tokens.AuthOptions{
 		Username:   ao.Username,
+		UserID:     ao.UserID,
 		Password:   ao.Password,
 		DomainName: ao.DomainName,
 		DomainID:   ao.DomainID,
-		// We need a scope to get the token roles list
 		Scope: tokens.Scope{
 			ProjectID:   ao.TenantID,
 			ProjectName: ao.TenantName,
diff --git a/internal/acceptance/openstack/identity/v3/oauth1_test.go b/internal/acceptance/openstack/identity/v3/oauth1_test.go
index da6c8be148..7a93d43fb4 100644
--- a/internal/acceptance/openstack/identity/v3/oauth1_test.go
+++ b/internal/acceptance/openstack/identity/v3/oauth1_test.go
@@ -24,10 +24,10 @@ func TestOAuth1CRUD(t *testing.T) {
 
 	authOptions := tokens.AuthOptions{
 		Username:   ao.Username,
+		UserID:     ao.UserID,
 		Password:   ao.Password,
 		DomainName: ao.DomainName,
 		DomainID:   ao.DomainID,
-		// We need a scope to get the token roles list
 		Scope: tokens.Scope{
 			ProjectID:   ao.TenantID,
 			ProjectName: ao.TenantName,
diff --git a/internal/acceptance/openstack/identity/v3/token_test.go b/internal/acceptance/openstack/identity/v3/token_test.go
index d5274ff6b1..1bc436caa7 100644
--- a/internal/acceptance/openstack/identity/v3/token_test.go
+++ b/internal/acceptance/openstack/identity/v3/token_test.go
@@ -24,8 +24,16 @@ func TestTokensGet(t *testing.T) {
 
 	authOptions := tokens.AuthOptions{
 		Username:   ao.Username,
+		UserID:     ao.UserID,
 		Password:   ao.Password,
-		DomainName: "default",
+		DomainName: ao.DomainName,
+		DomainID:   ao.DomainID,
+		Scope: tokens.Scope{
+			ProjectID:   ao.TenantID,
+			ProjectName: ao.TenantName,
+			DomainID:    ao.DomainID,
+			DomainName:  ao.DomainName,
+		},
 	}
 
 	token, err := tokens.Create(context.TODO(), client, &authOptions).Extract()
diff --git a/internal/acceptance/openstack/identity/v3/trusts_test.go b/internal/acceptance/openstack/identity/v3/trusts_test.go
index 39c7191eea..2eb659d55b 100644
--- a/internal/acceptance/openstack/identity/v3/trusts_test.go
+++ b/internal/acceptance/openstack/identity/v3/trusts_test.go
@@ -29,9 +29,16 @@ func TestTrustCRUD(t *testing.T) {
 
 	authOptions := tokens.AuthOptions{
 		Username:   ao.Username,
+		UserID:     ao.UserID,
 		Password:   ao.Password,
 		DomainName: ao.DomainName,
 		DomainID:   ao.DomainID,
+		Scope: tokens.Scope{
+			ProjectID:   ao.TenantID,
+			ProjectName: ao.TenantName,
+			DomainID:    ao.DomainID,
+			DomainName:  ao.DomainName,
+		},
 	}
 
 	token, err := tokens.Create(context.TODO(), client, &authOptions).Extract()

From 5d5024a243ce4271cc1f126c8fc39b869dd3b23b Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Fri, 31 May 2024 15:29:19 +0100
Subject: [PATCH 26/32] tests: Add missing RequireAdmin calls

We're clearly not testing with non-admin credentials. That would be a
good future test but for now we simply fix the issues.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 .../acceptance/openstack/identity/v3/federation_test.go     | 6 ++++--
 internal/acceptance/openstack/identity/v3/oauth1_test.go    | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/internal/acceptance/openstack/identity/v3/federation_test.go b/internal/acceptance/openstack/identity/v3/federation_test.go
index b52d54cc30..35986dc15c 100644
--- a/internal/acceptance/openstack/identity/v3/federation_test.go
+++ b/internal/acceptance/openstack/identity/v3/federation_test.go
@@ -15,6 +15,8 @@ import (
 )
 
 func TestListMappings(t *testing.T) {
+	clients.RequireAdmin(t)
+
 	client, err := clients.NewIdentityV3Client()
 	th.AssertNoErr(t, err)
 
@@ -28,10 +30,10 @@ func TestListMappings(t *testing.T) {
 }
 
 func TestMappingsCRUD(t *testing.T) {
-	mappingName := tools.RandomString("TESTMAPPING-", 8)
-
 	clients.RequireAdmin(t)
 
+	mappingName := tools.RandomString("TESTMAPPING-", 8)
+
 	client, err := clients.NewIdentityV3Client()
 	th.AssertNoErr(t, err)
 
diff --git a/internal/acceptance/openstack/identity/v3/oauth1_test.go b/internal/acceptance/openstack/identity/v3/oauth1_test.go
index 7a93d43fb4..125fdd0588 100644
--- a/internal/acceptance/openstack/identity/v3/oauth1_test.go
+++ b/internal/acceptance/openstack/identity/v3/oauth1_test.go
@@ -16,6 +16,8 @@ import (
 )
 
 func TestOAuth1CRUD(t *testing.T) {
+	clients.RequireAdmin(t)
+
 	client, err := clients.NewIdentityV3Client()
 	th.AssertNoErr(t, err)
 

From cfa40d7bcd21ff2e53f1ed36a35307a08cf69caa Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Fri, 31 May 2024 15:30:16 +0100
Subject: [PATCH 27/32] scripts: Add getenvvar tool

Setting the necessary required environment variables has proven
relatively tricky to do. Add a tool that will start doing this for us.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 script/getenvvar | 85 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100755 script/getenvvar

diff --git a/script/getenvvar b/script/getenvvar
new file mode 100755
index 0000000000..dbaa08f445
--- /dev/null
+++ b/script/getenvvar
@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+
+"""
+Set environment variables required for the CI jobs by inspection of the
+clouds.yaml file. This is useful where you only have this file.
+
+To set variables:
+
+    $ eval $(./script/getenvvar)
+
+To unset them:
+
+    $ unset $(compgen -v | grep OS_)
+"""
+
+import argparse
+from pathlib import Path
+import sys
+
+import yaml
+
+p = Path('~/.config/openstack/clouds.yaml').expanduser()
+parser = argparse.ArgumentParser()
+parser.add_argument(
+    'cloud',
+    help="Cloud to export credentials for",
+)
+
+args = parser.parse_args()
+
+with p.open() as fh:
+    data = yaml.safe_load(fh)
+
+if args.cloud not in data.get('clouds', {}) or {}:
+    print(f'Could not find cloud {args.cloud} in {str(p)}', file=sys.stderr)
+    sys.exit(1)
+
+cloud = data['clouds'][args.cloud]
+
+if 'auth' not in cloud:
+    print(f'Missing auth section for cloud {cloud}', file=sys.stderr)
+    sys.exit(1)
+
+auth = cloud['auth']
+
+if 'username' not in auth or 'password' not in auth:
+    print('Only password authentication supported', file=sys.stderr)
+    sys.exit(1)
+
+# FIXME: This should work but does not, since the check for auth credentials
+# is just 'OS_USERNAME == admin'
+
+# user_id = auth.get('user_id')
+# project_id = auth.get('project_id')
+# if not user_id or not project_id:
+#     import openstack
+#     conn = openstack.connect(args.cloud)
+#     auth_ref = conn.config.get_auth().get_auth_ref(conn.session)
+#
+#     if not user_id:
+#         user_id = auth_ref.user_id
+#
+#     if not project_id:
+#         project_id = auth_ref.project_id
+#
+# result = f"""
+# unset OS_CLOUD
+# export OS_AUTH_URL={auth['auth_url']}
+# export OS_USERID={user_id}
+# export OS_PASSWORD={auth['password']}
+# export OS_PROJECT_ID={project_id}
+# export OS_REGION_NAME={cloud['region_name']}
+# """.strip()
+
+result = f"""
+unset OS_CLOUD
+export OS_AUTH_URL={auth['auth_url']}
+export OS_USERNAME={auth['username']}
+export OS_PASSWORD={auth['password']}
+export OS_PROJECT_NAME={auth['project_name']}
+export OS_DOMAIN_ID={auth['user_domain_id']}
+export OS_REGION_NAME={cloud['region_name']}
+"""
+
+print(result)

From 49ee31a654a8c9999941a8db6225c70917d344f1 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Wed, 17 Jul 2024 12:41:23 +0100
Subject: [PATCH 28/32] lint: Address recent lint issues

We really need to run golangci-lint in the gate but fix these issues for
now.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 .../extensions/bgpvpns/testing/requests_test.go  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/openstack/networking/v2/extensions/bgpvpns/testing/requests_test.go b/openstack/networking/v2/extensions/bgpvpns/testing/requests_test.go
index 859441f6f4..3b39e7cee0 100644
--- a/openstack/networking/v2/extensions/bgpvpns/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/bgpvpns/testing/requests_test.go
@@ -27,7 +27,9 @@ func TestList(t *testing.T) {
 			th.TestMethod(t, r, "GET")
 			th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
-			r.ParseForm()
+			if err := r.ParseForm(); err != nil {
+				t.Errorf("Failed to parse request form %v", err)
+			}
 			th.AssertDeepEquals(t, r.Form["fields"], fields)
 			th.AssertDeepEquals(t, r.Form["project_id"], filterProjectID)
 
@@ -177,7 +179,9 @@ func TestListNetworkAssociations(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
-		r.ParseForm()
+		if err := r.ParseForm(); err != nil {
+			t.Errorf("Failed to parse request form %v", err)
+		}
 		th.AssertDeepEquals(t, fields, r.Form["fields"])
 
 		w.Header().Add("Content-Type", "application/json")
@@ -278,7 +282,9 @@ func TestListRouterAssociations(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
-		r.ParseForm()
+		if err := r.ParseForm(); err != nil {
+			t.Errorf("Failed to parse request form %v", err)
+		}
 		th.AssertDeepEquals(t, fields, r.Form["fields"])
 
 		w.Header().Add("Content-Type", "application/json")
@@ -404,7 +410,9 @@ func TestListPortAssociations(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
-		r.ParseForm()
+		if err := r.ParseForm(); err != nil {
+			t.Errorf("Failed to parse request form %v", err)
+		}
 		th.AssertDeepEquals(t, fields, r.Form["fields"])
 
 		w.Header().Add("Content-Type", "application/json")

From f26116ef60fd556173f14ff1272b3eac3416cca0 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Fri, 29 Nov 2024 14:39:32 +0000
Subject: [PATCH 29/32] lint: Remove non-constant format string in calls
 (govet)

We were incorrectly using 'fmt.Printf', 'fmt.Errorf' and 't.Logf' with
non-template strings/no arguments. The fix to this is replace these
calls with the non-suffixed variants. There are many users of
'fmt.Fprint' - too many to do by hand - so this replacement was resolved
using 'sed':

  sed 's/Fprintf/Fprint/g' -i $(ag fmt.Fprintf -l)

We then manually fix the 25 cases where 'fmt.Fprintf' is actually
warranted and manually replaced the errant users of 'fmt.Errorf' and
't.Logf'. We also rework 'internal/acceptance/clients/clients.go'
slightly to make the code a bit clearer.

PS: This is apparently going to be an issue in go 1.24 (specifically in
'go vet') [1] so this is not just golangci-lint being annoying.
@PierrePrinetti, that's directed at you ;)

[1] https://github.com/golang/go/issues/60529

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 internal/acceptance/clients/clients.go        | 16 +++----
 internal/acceptance/tools/tools.go            |  2 +-
 .../apiversions/testing/fixtures_test.go      |  4 +-
 .../v1/allocations/testing/fixtures_test.go   |  8 ++--
 .../v1/conductors/testing/fixtures_test.go    |  8 ++--
 .../v1/drivers/testing/fixtures_test.go       |  8 ++--
 .../v1/nodes/testing/fixtures_test.go         | 38 +++++++--------
 .../v1/ports/testing/fixtures_test.go         | 12 ++---
 .../v1/introspection/testing/fixtures.go      |  8 ++--
 .../apiversions/testing/fixtures_test.go      |  4 +-
 .../testing/fixtures_test.go                  |  2 +-
 .../v2/backups/testing/fixtures_test.go       | 14 +++---
 .../v2/limits/testing/fixtures_test.go        |  2 +-
 .../v2/quotasets/testing/fixtures_test.go     |  2 +-
 .../schedulerstats/testing/fixtures_test.go   |  4 +-
 .../v2/services/testing/fixtures_test.go      |  2 +-
 .../v2/snapshots/testing/fixtures_test.go     |  8 ++--
 .../v2/transfers/testing/fixtures_test.go     |  8 ++--
 .../v2/volumes/testing/fixtures_test.go       | 30 ++++++------
 .../v3/attachments/testing/fixtures_test.go   | 10 ++--
 .../testing/fixtures_test.go                  |  2 +-
 .../v3/backups/testing/fixtures_test.go       | 14 +++---
 .../v3/limits/testing/fixtures_test.go        |  2 +-
 .../v3/qos/testing/fixtures_test.go           | 10 ++--
 .../v3/quotasets/testing/fixtures_test.go     |  2 +-
 .../schedulerstats/testing/fixtures_test.go   |  4 +-
 .../v3/services/testing/fixtures_test.go      |  2 +-
 .../v3/snapshots/testing/fixtures_test.go     | 10 ++--
 .../v3/transfers/testing/fixtures_test.go     |  8 ++--
 .../v3/volumes/testing/fixtures_test.go       | 32 ++++++-------
 .../v3/volumetypes/testing/fixtures_test.go   | 24 +++++-----
 .../v3/volumetypes/testing/requests_test.go   |  2 +-
 .../common/extensions/testing/fixtures.go     |  4 +-
 .../apiversions/testing/fixtures_test.go      |  6 +--
 .../v2/aggregates/testing/fixtures_test.go    | 14 +++---
 .../attachinterfaces/testing/fixtures_test.go |  6 +--
 .../testing/fixtures_test.go                  |  4 +-
 .../v2/extensions/testing/fixtures_test.go    |  4 +-
 .../v2/flavors/testing/fixtures_test.go       |  8 ++--
 .../v2/flavors/testing/requests_test.go       | 14 +++---
 .../v2/hypervisors/testing/fixtures_test.go   | 16 +++----
 .../instanceactions/testing/fixtures_test.go  |  4 +-
 .../v2/keypairs/testing/fixtures_test.go      | 12 ++---
 .../v2/limits/testing/fixtures_test.go        |  2 +-
 .../v2/quotasets/testing/fixtures_test.go     |  8 ++--
 .../remoteconsoles/testing/requests_test.go   |  2 +-
 .../v2/secgroups/testing/fixtures_test.go     | 14 +++---
 .../v2/servergroups/testing/fixtures_test.go  | 10 ++--
 .../v2/servers/testing/fixtures_test.go       | 46 +++++++++---------
 .../v2/services/testing/fixtures_test.go      |  6 +--
 .../compute/v2/tags/testing/requests_test.go  |  4 +-
 .../v2/volumeattach/testing/fixtures_test.go  |  6 +--
 .../v1/capsules/testing/fixtures_test.go      | 10 ++--
 .../apiversions/testing/fixtures_test.go      |  4 +-
 .../v1/certificates/testing/fixtures_test.go  |  2 +-
 .../v1/nodegroups/testing/fixtures_test.go    | 22 ++++-----
 .../v2/recordsets/testing/fixtures_test.go    | 12 ++---
 .../transfer/accept/testing/fixtures_test.go  |  8 ++--
 .../transfer/request/testing/fixtures_test.go |  8 ++--
 .../dns/v2/zones/testing/fixtures_test.go     | 10 ++--
 .../v2/extensions/testing/fixtures_test.go    |  2 +-
 .../v2/roles/testing/fixtures_test.go         |  2 +-
 .../v2/tenants/testing/fixtures_test.go       |  8 ++--
 .../v2/tokens/testing/fixtures_test.go        |  4 +-
 .../v2/users/testing/fixtures_test.go         | 10 ++--
 .../testing/fixtures_test.go                  | 14 +++---
 .../v3/catalog/testing/fixtures_test.go       |  2 +-
 .../v3/credentials/testing/fixtures_test.go   |  8 ++--
 .../v3/domains/testing/fixtures_test.go       | 10 ++--
 .../ec2credentials/testing/fixtures_test.go   |  6 +--
 .../v3/ec2tokens/testing/requests_test.go     |  2 +-
 .../v3/endpoints/testing/requests_test.go     |  6 +--
 .../v3/federation/testing/fixtures_test.go    |  8 ++--
 .../v3/groups/testing/fixtures_test.go        |  8 ++--
 .../v3/limits/testing/fixtures_test.go        | 10 ++--
 .../v3/oauth1/testing/fixtures_test.go        | 24 +++++-----
 .../v3/policies/testing/fixtures_test.go      | 10 ++--
 .../projectendpoints/testing/requests_test.go |  2 +-
 .../v3/projects/testing/fixtures_test.go      | 14 +++---
 .../v3/regions/testing/fixtures_test.go       |  8 ++--
 .../registeredlimits/testing/fixtures_test.go |  8 ++--
 .../v3/roles/testing/fixtures_test.go         | 28 +++++------
 .../v3/services/testing/fixtures_test.go      |  8 ++--
 .../v3/tokens/testing/requests_test.go        | 10 ++--
 .../v3/trusts/testing/fixtures_test.go        | 12 ++---
 .../v3/users/testing/fixtures_test.go         | 16 +++----
 .../v2/imageimport/testing/requests_test.go   |  4 +-
 .../image/v2/images/testing/fixtures_test.go  | 16 +++----
 .../image/v2/members/testing/fixtures_test.go | 10 ++--
 .../image/v2/tasks/testing/requests_test.go   |  6 +--
 .../v1/acls/testing/fixtures_test.go          | 12 ++---
 .../v1/containers/testing/fixtures_test.go    | 12 ++---
 .../v1/orders/testing/fixtures_test.go        |  6 +--
 .../v1/secrets/testing/fixtures_test.go       | 18 +++----
 .../v2/amphorae/testing/fixtures_test.go      |  6 +--
 .../v2/apiversions/testing/fixture.go         |  2 +-
 .../v2/flavorprofiles/testing/fixtures.go     | 10 ++--
 .../v2/flavors/testing/fixtures.go            | 10 ++--
 .../v2/flavors/testing/requests_test.go       |  2 +-
 .../v2/l7policies/testing/fixtures_test.go    | 22 ++++-----
 .../v2/listeners/testing/fixtures_test.go     | 12 ++---
 .../v2/loadbalancers/testing/fixtures_test.go | 16 +++----
 .../v2/monitors/testing/fixtures_test.go      | 10 ++--
 .../v2/pools/testing/fixtures_test.go         | 20 ++++----
 .../v2/providers/testing/fixtures_test.go     |  2 +-
 .../v2/quotas/testing/requests_test.go        |  8 ++--
 .../v2/claims/testing/fixtures_test.go        |  4 +-
 .../v2/messages/testing/fixtures_test.go      | 10 ++--
 .../v2/queues/testing/fixtures_test.go        | 10 ++--
 .../v2/apiversions/testing/requests_test.go   |  4 +-
 .../agents/testing/requests_test.go           | 14 +++---
 .../attributestags/testing/requests_test.go   |  4 +-
 .../bgp/peers/testing/requests_test.go        |  8 ++--
 .../bgp/speakers/testing/requests_test.go     | 18 +++----
 .../bgpvpns/testing/requests_test.go          | 30 ++++++------
 .../extensions/dns/testing/fixtures_test.go   | 22 ++++-----
 .../external/testing/results_test.go          |  8 ++--
 .../fwaas_v2/groups/testing/requests_test.go  | 12 ++---
 .../policies/testing/requests_test.go         | 12 ++---
 .../fwaas_v2/rules/testing/requests_test.go   | 10 ++--
 .../addressscopes/testing/requests_test.go    |  8 ++--
 .../extraroutes/testing/requests_test.go      |  4 +-
 .../floatingips/testing/requests_test.go      | 16 +++----
 .../portforwarding/testing/requests_test.go   |  8 ++--
 .../layer3/routers/testing/requests_test.go   | 18 +++----
 .../v2/extensions/mtu/testing/results_test.go |  8 ++--
 .../testing/requests_test.go                  |  4 +-
 .../portsbinding/testing/fixtures_test.go     |  8 ++--
 .../provider/testing/results_test.go          | 10 ++--
 .../qos/policies/testing/requests_test.go     | 24 +++++-----
 .../qos/rules/testing/requests_test.go        | 24 +++++-----
 .../qos/ruletypes/testing/requests_test.go    |  2 +-
 .../quotas/testing/requests_test.go           |  6 +--
 .../rbacpolicies/testing/requests_test.go     | 10 ++--
 .../security/groups/testing/requests_test.go  |  8 ++--
 .../security/rules/testing/requests_test.go   |  8 ++--
 .../subnetpools/testing/requests_test.go      |  8 ++--
 .../v2/extensions/testing/delegate_test.go    |  4 +-
 .../trunks/testing/requests_test.go           | 16 +++----
 .../vlantransparent/testing/requests_test.go  |  8 ++--
 .../endpointgroups/testing/requests_test.go   |  8 ++--
 .../ikepolicies/testing/requests_test.go      |  8 ++--
 .../ipsecpolicies/testing/requests_test.go    |  8 ++--
 .../vpnaas/services/testing/requests_test.go  |  8 ++--
 .../siteconnections/testing/requests_test.go  |  8 ++--
 .../v2/networks/testing/requests_test.go      | 22 ++++-----
 .../v2/ports/testing/requests_test.go         | 48 +++++++++----------
 .../v2/subnets/testing/requests_test.go       | 32 ++++++-------
 .../v1/containers/testing/fixtures.go         |  8 ++--
 .../v1/objects/testing/fixtures_test.go       | 12 ++---
 .../v1/swauth/testing/fixtures_test.go        |  2 +-
 .../v1/apiversions/testing/requests_test.go   |  2 +-
 .../v1/buildinfo/testing/fixtures_test.go     |  2 +-
 .../v1/stackevents/testing/fixtures_test.go   | 12 ++---
 .../stackresources/testing/fixtures_test.go   | 16 +++----
 .../v1/stacks/testing/fixtures_test.go        | 14 +++---
 .../orchestration/v1/stacks/utils_test.go     |  2 +-
 .../stacktemplates/testing/fixtures_test.go   |  4 +-
 .../testing/fixtures_test.go                  | 16 +++----
 .../apiversions/testing/fixtures_test.go      |  8 ++--
 .../testing/fixtures_test.go                  |  2 +-
 .../v2/errors/testing/fixtures_test.go        |  2 +-
 .../v2/messages/testing/fixtures_test.go      |  6 +--
 .../v2/replicas/testing/fixtures_test.go      |  8 ++--
 .../schedulerstats/testing/fixtures_test.go   |  4 +-
 .../securityservices/testing/fixtures_test.go | 10 ++--
 .../v2/services/testing/fixtures_test.go      |  2 +-
 .../shareaccessrules/testing/fixtures_test.go |  2 +-
 .../shareaccessrules/testing/requests_test.go |  2 +-
 .../v2/sharenetworks/testing/fixtures_test.go | 24 +++++-----
 .../v2/shares/testing/fixtures_test.go        | 14 +++---
 .../sharetransfers/testing/fixtures_test.go   |  8 ++--
 .../v2/sharetypes/testing/fixtures_test.go    | 12 ++---
 .../v2/snapshots/testing/fixtures_test.go     |  6 +--
 openstack/testing/client_test.go              |  6 +--
 .../v2/crontriggers/testing/requests_test.go  |  6 +--
 .../v2/executions/testing/requests_test.go    |  6 +--
 .../v2/workflows/testing/requests_test.go     | 10 ++--
 pagination/testing/linked_test.go             |  2 +-
 pagination/testing/marker_test.go             |  6 +--
 pagination/testing/single_test.go             |  2 +-
 testhelper/fixture/helper.go                  |  2 +-
 testing/provider_client_test.go               |  4 +-
 183 files changed, 882 insertions(+), 884 deletions(-)

diff --git a/internal/acceptance/clients/clients.go b/internal/acceptance/clients/clients.go
index 21be9dbea2..f981ffcea2 100644
--- a/internal/acceptance/clients/clients.go
+++ b/internal/acceptance/clients/clients.go
@@ -107,16 +107,14 @@ func AcceptanceTestChoicesFromEnv() (*AcceptanceTestChoices, error) {
 		notDistinct = "OS_FLAVOR_ID and OS_FLAVOR_ID_RESIZE must be distinct."
 	}
 
-	if len(missing) > 0 || notDistinct != "" {
-		text := "You're missing some important setup:\n"
-		if len(missing) > 0 {
-			text += " * These environment variables must be provided: " + strings.Join(missing, ", ") + "\n"
-		}
-		if notDistinct != "" {
-			text += " * " + notDistinct + "\n"
-		}
+	if len(missing) > 0 {
+		text := "You're missing some important setup:\n * These environment variables must be provided: %s\n"
+		return nil, fmt.Errorf(text, strings.Join(missing, ", "))
+	}
 
-		return nil, fmt.Errorf(text)
+	if notDistinct != "" {
+		text := "You're missing some important setup:\n * %s\n"
+		return nil, fmt.Errorf(text, notDistinct)
 	}
 
 	return &AcceptanceTestChoices{
diff --git a/internal/acceptance/tools/tools.go b/internal/acceptance/tools/tools.go
index 8b0fad2ea6..75ac004473 100644
--- a/internal/acceptance/tools/tools.go
+++ b/internal/acceptance/tools/tools.go
@@ -81,5 +81,5 @@ func Elide(value string) string {
 // PrintResource returns a resource as a readable structure
 func PrintResource(t *testing.T, resource any) {
 	b, _ := json.MarshalIndent(resource, "", "  ")
-	t.Logf(string(b))
+	t.Log(string(b))
 }
diff --git a/openstack/baremetal/apiversions/testing/fixtures_test.go b/openstack/baremetal/apiversions/testing/fixtures_test.go
index 5e169d36fc..d0e11553c2 100644
--- a/openstack/baremetal/apiversions/testing/fixtures_test.go
+++ b/openstack/baremetal/apiversions/testing/fixtures_test.go
@@ -89,7 +89,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, IronicAPIAllVersionResponse)
+		fmt.Fprint(w, IronicAPIAllVersionResponse)
 	})
 }
 
@@ -101,6 +101,6 @@ func MockGetResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, IronicAPIVersionResponse)
+		fmt.Fprint(w, IronicAPIVersionResponse)
 	})
 }
diff --git a/openstack/baremetal/v1/allocations/testing/fixtures_test.go b/openstack/baremetal/v1/allocations/testing/fixtures_test.go
index 6b8655169b..7ee9fa4834 100644
--- a/openstack/baremetal/v1/allocations/testing/fixtures_test.go
+++ b/openstack/baremetal/v1/allocations/testing/fixtures_test.go
@@ -120,10 +120,10 @@ func HandleAllocationListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, AllocationListBody)
+			fmt.Fprint(w, AllocationListBody)
 
 		case "eff80f47-75f0-4d41-b1aa-cf07c201adac":
-			fmt.Fprintf(w, `{ "allocations": [] }`)
+			fmt.Fprint(w, `{ "allocations": [] }`)
 		default:
 			t.Fatalf("/allocations invoked with unexpected marker=[%s]", marker)
 		}
@@ -145,7 +145,7 @@ func HandleAllocationCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -165,6 +165,6 @@ func HandleAllocationGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleAllocationBody)
+		fmt.Fprint(w, SingleAllocationBody)
 	})
 }
diff --git a/openstack/baremetal/v1/conductors/testing/fixtures_test.go b/openstack/baremetal/v1/conductors/testing/fixtures_test.go
index 8e59ddaab4..fd66a34d4b 100644
--- a/openstack/baremetal/v1/conductors/testing/fixtures_test.go
+++ b/openstack/baremetal/v1/conductors/testing/fixtures_test.go
@@ -150,10 +150,10 @@ func HandleConductorListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, ConductorListBody)
+			fmt.Fprint(w, ConductorListBody)
 
 		case "9e5476bd-a4ec-4653-93d6-72c93aa682ba":
-			fmt.Fprintf(w, `{ "servers": [] }`)
+			fmt.Fprint(w, `{ "servers": [] }`)
 		default:
 			t.Fatalf("/conductors invoked with unexpected marker=[%s]", marker)
 		}
@@ -170,7 +170,7 @@ func HandleConductorListDetailSuccessfully(t *testing.T) {
 			t.Errorf("Failed to parse request form %v", err)
 		}
 
-		fmt.Fprintf(w, ConductorListDetailBody)
+		fmt.Fprint(w, ConductorListDetailBody)
 	})
 }
 
@@ -180,6 +180,6 @@ func HandleConductorGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleConductorBody)
+		fmt.Fprint(w, SingleConductorBody)
 	})
 }
diff --git a/openstack/baremetal/v1/drivers/testing/fixtures_test.go b/openstack/baremetal/v1/drivers/testing/fixtures_test.go
index a06bcee928..6c6d0fcc7e 100644
--- a/openstack/baremetal/v1/drivers/testing/fixtures_test.go
+++ b/openstack/baremetal/v1/drivers/testing/fixtures_test.go
@@ -377,7 +377,7 @@ func HandleListDriversSuccessfully(t *testing.T) {
 			t.Errorf("Failed to parse request form %v", err)
 		}
 
-		fmt.Fprintf(w, ListDriversBody)
+		fmt.Fprint(w, ListDriversBody)
 	})
 }
 
@@ -388,7 +388,7 @@ func HandleGetDriverDetailsSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleDriverDetails)
+		fmt.Fprint(w, SingleDriverDetails)
 	})
 }
 
@@ -399,7 +399,7 @@ func HandleGetDriverPropertiesSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleDriverProperties)
+		fmt.Fprint(w, SingleDriverProperties)
 	})
 }
 
@@ -410,6 +410,6 @@ func HandleGetDriverDiskPropertiesSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleDriverDiskProperties)
+		fmt.Fprint(w, SingleDriverDiskProperties)
 	})
 }
diff --git a/openstack/baremetal/v1/nodes/testing/fixtures_test.go b/openstack/baremetal/v1/nodes/testing/fixtures_test.go
index 7819111314..88abebcebb 100644
--- a/openstack/baremetal/v1/nodes/testing/fixtures_test.go
+++ b/openstack/baremetal/v1/nodes/testing/fixtures_test.go
@@ -1409,10 +1409,10 @@ func HandleNodeListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, NodeListBody)
+			fmt.Fprint(w, NodeListBody)
 
 		case "9e5476bd-a4ec-4653-93d6-72c93aa682ba":
-			fmt.Fprintf(w, `{ "servers": [] }`)
+			fmt.Fprint(w, `{ "servers": [] }`)
 		default:
 			t.Fatalf("/nodes invoked with unexpected marker=[%s]", marker)
 		}
@@ -1429,7 +1429,7 @@ func HandleNodeListDetailSuccessfully(t *testing.T) {
 			t.Errorf("Failed to parse request form %v", err)
 		}
 
-		fmt.Fprintf(w, NodeListDetailBody)
+		fmt.Fprint(w, NodeListDetailBody)
 	})
 }
 
@@ -1456,7 +1456,7 @@ func HandleNodeCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -1476,7 +1476,7 @@ func HandleNodeGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleNodeBody)
+		fmt.Fprint(w, SingleNodeBody)
 	})
 }
 
@@ -1488,7 +1488,7 @@ func HandleNodeUpdateSuccessfully(t *testing.T, response string) {
 		th.TestHeader(t, r, "Content-Type", "application/json")
 		th.TestJSONRequest(t, r, `[{"op": "replace", "path": "/properties", "value": {"root_gb": 25}}]`)
 
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -1498,7 +1498,7 @@ func HandleNodeValidateSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, NodeValidationBody)
+		fmt.Fprint(w, NodeValidationBody)
 	})
 }
 
@@ -1530,7 +1530,7 @@ func HandleGetBootDeviceSuccessfully(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, NodeBootDeviceBody)
+		fmt.Fprint(w, NodeBootDeviceBody)
 	})
 }
 
@@ -1540,7 +1540,7 @@ func HandleGetSupportedBootDeviceSuccessfully(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, NodeSupportedBootDeviceBody)
+		fmt.Fprint(w, NodeSupportedBootDeviceBody)
 	})
 }
 
@@ -1672,7 +1672,7 @@ func HandleListBIOSSettingsSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, NodeBIOSSettingsBody)
+		fmt.Fprint(w, NodeBIOSSettingsBody)
 	})
 }
 
@@ -1682,7 +1682,7 @@ func HandleListDetailBIOSSettingsSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, NodeDetailBIOSSettingsBody)
+		fmt.Fprint(w, NodeDetailBIOSSettingsBody)
 	})
 }
 
@@ -1692,7 +1692,7 @@ func HandleGetBIOSSettingSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, NodeSingleBIOSSettingBody)
+		fmt.Fprint(w, NodeSingleBIOSSettingBody)
 	})
 }
 
@@ -1702,7 +1702,7 @@ func HandleGetVendorPassthruMethodsSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, NodeVendorPassthruMethodsBody)
+		fmt.Fprint(w, NodeVendorPassthruMethodsBody)
 	})
 }
 
@@ -1713,7 +1713,7 @@ func HandleGetAllSubscriptionsVendorPassthruSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "Accept", "application/json")
 		th.TestFormValues(t, r, map[string]string{"method": "get_all_subscriptions"})
 
-		fmt.Fprintf(w, NodeGetAllSubscriptionsVnedorPassthruBody)
+		fmt.Fprint(w, NodeGetAllSubscriptionsVnedorPassthruBody)
 	})
 }
 
@@ -1729,7 +1729,7 @@ func HandleGetSubscriptionVendorPassthruSuccessfully(t *testing.T) {
 			}
 		`)
 
-		fmt.Fprintf(w, NodeGetSubscriptionVendorPassthruBody)
+		fmt.Fprint(w, NodeGetSubscriptionVendorPassthruBody)
 	})
 }
 
@@ -1749,7 +1749,7 @@ func HandleCreateSubscriptionVendorPassthruAllParametersSuccessfully(t *testing.
 			}
 		`)
 
-		fmt.Fprintf(w, NodeCreateSubscriptionVendorPassthruAllParametersBody)
+		fmt.Fprint(w, NodeCreateSubscriptionVendorPassthruAllParametersBody)
 	})
 }
 
@@ -1765,7 +1765,7 @@ func HandleCreateSubscriptionVendorPassthruRequiredParametersSuccessfully(t *tes
 			}
 		`)
 
-		fmt.Fprintf(w, NodeCreateSubscriptionVendorPassthruRequiredParametersBody)
+		fmt.Fprint(w, NodeCreateSubscriptionVendorPassthruRequiredParametersBody)
 	})
 }
 
@@ -1810,7 +1810,7 @@ func HandleGetInventorySuccessfully(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, NodeInventoryBody)
+		fmt.Fprint(w, NodeInventoryBody)
 	})
 }
 
@@ -1820,7 +1820,7 @@ func HandleListFirmwareSuccessfully(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, NodeFirmwareListBody)
+		fmt.Fprint(w, NodeFirmwareListBody)
 	})
 }
 
diff --git a/openstack/baremetal/v1/ports/testing/fixtures_test.go b/openstack/baremetal/v1/ports/testing/fixtures_test.go
index 492aa42aa6..a6221ecd4a 100644
--- a/openstack/baremetal/v1/ports/testing/fixtures_test.go
+++ b/openstack/baremetal/v1/ports/testing/fixtures_test.go
@@ -181,10 +181,10 @@ func HandlePortListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, PortListBody)
+			fmt.Fprint(w, PortListBody)
 
 		case "f2845e11-dbd4-4728-a8c0-30d19f48924a":
-			fmt.Fprintf(w, `{ "ports": [] }`)
+			fmt.Fprint(w, `{ "ports": [] }`)
 		default:
 			t.Fatalf("/ports invoked with unexpected marker=[%s]", marker)
 		}
@@ -201,7 +201,7 @@ func HandlePortListDetailSuccessfully(t *testing.T) {
 			t.Errorf("Failed to parse request form %v", err)
 		}
 
-		fmt.Fprintf(w, PortListDetailBody)
+		fmt.Fprint(w, PortListDetailBody)
 	})
 }
 
@@ -219,7 +219,7 @@ func HandlePortCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -239,7 +239,7 @@ func HandlePortGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SinglePortBody)
+		fmt.Fprint(w, SinglePortBody)
 	})
 }
 
@@ -251,6 +251,6 @@ func HandlePortUpdateSuccessfully(t *testing.T, response string) {
 		th.TestHeader(t, r, "Content-Type", "application/json")
 		th.TestJSONRequest(t, r, `[{"op": "replace", "path": "/address", "value": "22:22:22:22:22:22"}]`)
 
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
diff --git a/openstack/baremetalintrospection/v1/introspection/testing/fixtures.go b/openstack/baremetalintrospection/v1/introspection/testing/fixtures.go
index af2ad9e7f5..56a4299aef 100644
--- a/openstack/baremetalintrospection/v1/introspection/testing/fixtures.go
+++ b/openstack/baremetalintrospection/v1/introspection/testing/fixtures.go
@@ -467,10 +467,10 @@ func HandleListIntrospectionsSuccessfully(t *testing.T) {
 
 		switch marker {
 		case "":
-			fmt.Fprintf(w, IntrospectionListBody)
+			fmt.Fprint(w, IntrospectionListBody)
 
 		case "c244557e-899f-46fa-a1ff-5b2c6718616b":
-			fmt.Fprintf(w, `{ "introspection": [] }`)
+			fmt.Fprint(w, `{ "introspection": [] }`)
 
 		default:
 			t.Fatalf("/introspection invoked with unexpected marker=[%s]", marker)
@@ -484,7 +484,7 @@ func HandleGetIntrospectionStatusSuccessfully(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
-		fmt.Fprintf(w, IntrospectionStatus)
+		fmt.Fprint(w, IntrospectionStatus)
 	})
 }
 
@@ -513,7 +513,7 @@ func HandleGetIntrospectionDataSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, IntrospectionDataJSONSample)
+		fmt.Fprint(w, IntrospectionDataJSONSample)
 	})
 }
 
diff --git a/openstack/blockstorage/apiversions/testing/fixtures_test.go b/openstack/blockstorage/apiversions/testing/fixtures_test.go
index 4a368e9da9..ed78b1e472 100644
--- a/openstack/blockstorage/apiversions/testing/fixtures_test.go
+++ b/openstack/blockstorage/apiversions/testing/fixtures_test.go
@@ -124,7 +124,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, APIListResponse)
+		fmt.Fprint(w, APIListResponse)
 	})
 }
 
@@ -136,6 +136,6 @@ func MockListOldResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, APIListOldResponse)
+		fmt.Fprint(w, APIListOldResponse)
 	})
 }
diff --git a/openstack/blockstorage/v2/availabilityzones/testing/fixtures_test.go b/openstack/blockstorage/v2/availabilityzones/testing/fixtures_test.go
index b13e464abb..5c48bdce2e 100644
--- a/openstack/blockstorage/v2/availabilityzones/testing/fixtures_test.go
+++ b/openstack/blockstorage/v2/availabilityzones/testing/fixtures_test.go
@@ -47,6 +47,6 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
diff --git a/openstack/blockstorage/v2/backups/testing/fixtures_test.go b/openstack/blockstorage/v2/backups/testing/fixtures_test.go
index 2f24173418..4f1f45c122 100644
--- a/openstack/blockstorage/v2/backups/testing/fixtures_test.go
+++ b/openstack/blockstorage/v2/backups/testing/fixtures_test.go
@@ -210,7 +210,7 @@ func MockListResponse(t *testing.T) {
 		case "":
 			fmt.Fprintf(w, ListResponse, th.Server.URL)
 		case "1":
-			fmt.Fprintf(w, `{"backups": []}`)
+			fmt.Fprint(w, `{"backups": []}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -233,7 +233,7 @@ func MockListDetailResponse(t *testing.T) {
 		case "":
 			fmt.Fprintf(w, ListDetailResponse, th.Server.URL)
 		case "1":
-			fmt.Fprintf(w, `{"backups": []}`)
+			fmt.Fprint(w, `{"backups": []}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -247,7 +247,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
 
@@ -262,7 +262,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 }
 
@@ -277,7 +277,7 @@ func MockRestoreResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, RestoreResponse)
+		fmt.Fprint(w, RestoreResponse)
 	})
 }
 
@@ -298,7 +298,7 @@ func MockExportResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ExportResponse)
+		fmt.Fprint(w, ExportResponse)
 	})
 }
 
@@ -313,7 +313,7 @@ func MockImportResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, ImportResponse)
+		fmt.Fprint(w, ImportResponse)
 	})
 }
 
diff --git a/openstack/blockstorage/v2/limits/testing/fixtures_test.go b/openstack/blockstorage/v2/limits/testing/fixtures_test.go
index c3f8bf803d..bdd1308a17 100644
--- a/openstack/blockstorage/v2/limits/testing/fixtures_test.go
+++ b/openstack/blockstorage/v2/limits/testing/fixtures_test.go
@@ -124,6 +124,6 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
diff --git a/openstack/blockstorage/v2/quotasets/testing/fixtures_test.go b/openstack/blockstorage/v2/quotasets/testing/fixtures_test.go
index 066e1729c8..854ff08b63 100644
--- a/openstack/blockstorage/v2/quotasets/testing/fixtures_test.go
+++ b/openstack/blockstorage/v2/quotasets/testing/fixtures_test.go
@@ -164,7 +164,7 @@ func HandleSuccessfulRequest(t *testing.T, httpMethod, uriPath, jsonOutput strin
 			th.TestFormValues(t, r, uriQueryParams)
 		}
 
-		fmt.Fprintf(w, jsonOutput)
+		fmt.Fprint(w, jsonOutput)
 	})
 }
 
diff --git a/openstack/blockstorage/v2/schedulerstats/testing/fixtures_test.go b/openstack/blockstorage/v2/schedulerstats/testing/fixtures_test.go
index 3a7fee8160..05512dbf6d 100644
--- a/openstack/blockstorage/v2/schedulerstats/testing/fixtures_test.go
+++ b/openstack/blockstorage/v2/schedulerstats/testing/fixtures_test.go
@@ -104,9 +104,9 @@ func HandleStoragePoolsListSuccessfully(t *testing.T) {
 			t.Errorf("Failed to parse request form %v", err)
 		}
 		if r.FormValue("detail") == "true" {
-			fmt.Fprintf(w, StoragePoolsListBodyDetail)
+			fmt.Fprint(w, StoragePoolsListBodyDetail)
 		} else {
-			fmt.Fprintf(w, StoragePoolsListBody)
+			fmt.Fprint(w, StoragePoolsListBody)
 		}
 	})
 }
diff --git a/openstack/blockstorage/v2/services/testing/fixtures_test.go b/openstack/blockstorage/v2/services/testing/fixtures_test.go
index a396abc39e..41fb5bc614 100644
--- a/openstack/blockstorage/v2/services/testing/fixtures_test.go
+++ b/openstack/blockstorage/v2/services/testing/fixtures_test.go
@@ -92,6 +92,6 @@ func HandleListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, ServiceListBody)
+		fmt.Fprint(w, ServiceListBody)
 	})
 }
diff --git a/openstack/blockstorage/v2/snapshots/testing/fixtures_test.go b/openstack/blockstorage/v2/snapshots/testing/fixtures_test.go
index 2c00c8a05f..b2e5cf4c06 100644
--- a/openstack/blockstorage/v2/snapshots/testing/fixtures_test.go
+++ b/openstack/blockstorage/v2/snapshots/testing/fixtures_test.go
@@ -17,7 +17,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
     {
       "snapshots": [
         {
@@ -51,7 +51,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "snapshot": {
         "id": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
@@ -85,7 +85,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "snapshot": {
         "volume_id": "1234",
@@ -115,7 +115,7 @@ func MockUpdateMetadataResponse(t *testing.T) {
     }
     `)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
       {
         "metadata": {
           "key": "v1"
diff --git a/openstack/blockstorage/v2/transfers/testing/fixtures_test.go b/openstack/blockstorage/v2/transfers/testing/fixtures_test.go
index 6a150508eb..866d5068fc 100644
--- a/openstack/blockstorage/v2/transfers/testing/fixtures_test.go
+++ b/openstack/blockstorage/v2/transfers/testing/fixtures_test.go
@@ -167,7 +167,7 @@ func HandleCreateTransfer(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 }
 
@@ -179,7 +179,7 @@ func HandleAcceptTransfer(t *testing.T) {
 		th.TestJSONRequest(t, r, AcceptTransferRequest)
 
 		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, AcceptTransferResponse)
+		fmt.Fprint(w, AcceptTransferResponse)
 	})
 }
 
@@ -200,7 +200,7 @@ func HandleListTransfers(t *testing.T) {
 		th.TestFormValues(t, r, map[string]string{"all_tenants": "true"})
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -211,6 +211,6 @@ func HandleGetTransfer(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
diff --git a/openstack/blockstorage/v2/volumes/testing/fixtures_test.go b/openstack/blockstorage/v2/volumes/testing/fixtures_test.go
index 80677d2e40..d6688f7850 100644
--- a/openstack/blockstorage/v2/volumes/testing/fixtures_test.go
+++ b/openstack/blockstorage/v2/volumes/testing/fixtures_test.go
@@ -17,7 +17,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
   {
   "volumes": [
     {
@@ -93,7 +93,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "volume": {
     "volume_type": "lvmdriver-1",
@@ -152,7 +152,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "volume": {
     "size": 75,
@@ -192,7 +192,7 @@ func MockUpdateResponse(t *testing.T) {
 		th.TestMethod(t, r, "PUT")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "volume": {
     "name": "vol-002"
@@ -223,7 +223,7 @@ func MockAttachResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -243,7 +243,7 @@ func MockBeginDetachingResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -263,7 +263,7 @@ func MockDetachResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -288,7 +288,7 @@ func MockUploadImageResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `
+			fmt.Fprint(w, `
 {
     "os-volume_upload_image": {
         "container_format": "bare",
@@ -335,7 +335,7 @@ func MockReserveResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -355,7 +355,7 @@ func MockUnreserveResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -386,7 +386,7 @@ func MockInitializeConnectionResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{
+			fmt.Fprint(w, `{
 "connection_info": {
     "data": {
       "target_portals": [
@@ -443,7 +443,7 @@ func MockTerminateConnectionResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -466,7 +466,7 @@ func MockExtendSizeResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -497,7 +497,7 @@ func MockSetImageMetadataResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `{}`)
+		fmt.Fprint(w, `{}`)
 	})
 }
 
@@ -560,7 +560,7 @@ func MockChangeTypeResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
diff --git a/openstack/blockstorage/v3/attachments/testing/fixtures_test.go b/openstack/blockstorage/v3/attachments/testing/fixtures_test.go
index d489ce16ef..18471c3b38 100644
--- a/openstack/blockstorage/v3/attachments/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/attachments/testing/fixtures_test.go
@@ -64,7 +64,7 @@ func MockListResponse(t *testing.T) {
 }
   `, th.Server.URL)
 		case "1":
-			fmt.Fprintf(w, `{"volumes": []}`)
+			fmt.Fprint(w, `{"volumes": []}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -78,7 +78,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "attachment": {
         "status": "attaching",
@@ -123,7 +123,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "attachment": {
         "status": "attaching",
@@ -171,7 +171,7 @@ func MockUpdateResponse(t *testing.T) {
       `)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "attachment": {
         "status": "attaching",
@@ -202,7 +202,7 @@ func MockUpdateEmptyResponse(t *testing.T) {
       `)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "attachment": {
         "status": "attaching",
diff --git a/openstack/blockstorage/v3/availabilityzones/testing/fixtures_test.go b/openstack/blockstorage/v3/availabilityzones/testing/fixtures_test.go
index 98f93db1d3..780c7dec26 100644
--- a/openstack/blockstorage/v3/availabilityzones/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/availabilityzones/testing/fixtures_test.go
@@ -47,6 +47,6 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
diff --git a/openstack/blockstorage/v3/backups/testing/fixtures_test.go b/openstack/blockstorage/v3/backups/testing/fixtures_test.go
index 13fc1d61d9..9bbaec87d4 100644
--- a/openstack/blockstorage/v3/backups/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/backups/testing/fixtures_test.go
@@ -210,7 +210,7 @@ func MockListResponse(t *testing.T) {
 		case "":
 			fmt.Fprintf(w, ListResponse, th.Server.URL)
 		case "1":
-			fmt.Fprintf(w, `{"backups": []}`)
+			fmt.Fprint(w, `{"backups": []}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -233,7 +233,7 @@ func MockListDetailResponse(t *testing.T) {
 		case "":
 			fmt.Fprintf(w, ListDetailResponse, th.Server.URL)
 		case "1":
-			fmt.Fprintf(w, `{"backups": []}`)
+			fmt.Fprint(w, `{"backups": []}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -247,7 +247,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
 
@@ -262,7 +262,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 }
 
@@ -277,7 +277,7 @@ func MockRestoreResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, RestoreResponse)
+		fmt.Fprint(w, RestoreResponse)
 	})
 }
 
@@ -298,7 +298,7 @@ func MockExportResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ExportResponse)
+		fmt.Fprint(w, ExportResponse)
 	})
 }
 
@@ -313,7 +313,7 @@ func MockImportResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, ImportResponse)
+		fmt.Fprint(w, ImportResponse)
 	})
 }
 
diff --git a/openstack/blockstorage/v3/limits/testing/fixtures_test.go b/openstack/blockstorage/v3/limits/testing/fixtures_test.go
index 5d3b647427..68fe8ae833 100644
--- a/openstack/blockstorage/v3/limits/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/limits/testing/fixtures_test.go
@@ -124,6 +124,6 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
diff --git a/openstack/blockstorage/v3/qos/testing/fixtures_test.go b/openstack/blockstorage/v3/qos/testing/fixtures_test.go
index 8f9d2e2d51..e6cd002cea 100644
--- a/openstack/blockstorage/v3/qos/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/qos/testing/fixtures_test.go
@@ -47,7 +47,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "qos_specs": {
     "id": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
@@ -110,7 +110,7 @@ func MockListResponse(t *testing.T) {
 					}
 				`, th.Server.URL)
 		case "2":
-			fmt.Fprintf(w, `{ "qos_specs": [] }`)
+			fmt.Fprint(w, `{ "qos_specs": [] }`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -124,7 +124,7 @@ func MockGetResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "qos_specs": {
     "id": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
@@ -172,7 +172,7 @@ func MockUpdateResponse(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateBody)
+		fmt.Fprint(w, UpdateBody)
 	})
 }
 
@@ -219,7 +219,7 @@ func MockListAssociationsResponse(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 			  "qos_associations": [
 			    {
diff --git a/openstack/blockstorage/v3/quotasets/testing/fixtures_test.go b/openstack/blockstorage/v3/quotasets/testing/fixtures_test.go
index df029ff8e1..103afef6ef 100644
--- a/openstack/blockstorage/v3/quotasets/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/quotasets/testing/fixtures_test.go
@@ -164,7 +164,7 @@ func HandleSuccessfulRequest(t *testing.T, httpMethod, uriPath, jsonOutput strin
 			th.TestFormValues(t, r, uriQueryParams)
 		}
 
-		fmt.Fprintf(w, jsonOutput)
+		fmt.Fprint(w, jsonOutput)
 	})
 }
 
diff --git a/openstack/blockstorage/v3/schedulerstats/testing/fixtures_test.go b/openstack/blockstorage/v3/schedulerstats/testing/fixtures_test.go
index 0a1286e862..18462bfb20 100644
--- a/openstack/blockstorage/v3/schedulerstats/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/schedulerstats/testing/fixtures_test.go
@@ -104,9 +104,9 @@ func HandleStoragePoolsListSuccessfully(t *testing.T) {
 			t.Errorf("Failed to parse request form %v", err)
 		}
 		if r.FormValue("detail") == "true" {
-			fmt.Fprintf(w, StoragePoolsListBodyDetail)
+			fmt.Fprint(w, StoragePoolsListBodyDetail)
 		} else {
-			fmt.Fprintf(w, StoragePoolsListBody)
+			fmt.Fprint(w, StoragePoolsListBody)
 		}
 	})
 }
diff --git a/openstack/blockstorage/v3/services/testing/fixtures_test.go b/openstack/blockstorage/v3/services/testing/fixtures_test.go
index adf7993df7..63771ff032 100644
--- a/openstack/blockstorage/v3/services/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/services/testing/fixtures_test.go
@@ -92,6 +92,6 @@ func HandleListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, ServiceListBody)
+		fmt.Fprint(w, ServiceListBody)
 	})
 }
diff --git a/openstack/blockstorage/v3/snapshots/testing/fixtures_test.go b/openstack/blockstorage/v3/snapshots/testing/fixtures_test.go
index 8bbc45e77d..25e54b9b3e 100644
--- a/openstack/blockstorage/v3/snapshots/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/snapshots/testing/fixtures_test.go
@@ -54,7 +54,7 @@ func MockListResponse(t *testing.T) {
     }
     `, th.Server.URL)
 		case "1":
-			fmt.Fprintf(w, `{"snapshots": []}`)
+			fmt.Fprint(w, `{"snapshots": []}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -69,7 +69,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "snapshot": {
         "id": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
@@ -104,7 +104,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "snapshot": {
         "volume_id": "1234",
@@ -135,7 +135,7 @@ func MockUpdateMetadataResponse(t *testing.T) {
     }
     `)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
       {
         "metadata": {
           "key": "v1"
@@ -162,7 +162,7 @@ func MockUpdateResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "snapshot": {
         "id": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
diff --git a/openstack/blockstorage/v3/transfers/testing/fixtures_test.go b/openstack/blockstorage/v3/transfers/testing/fixtures_test.go
index b2c11f60c7..859e454eca 100644
--- a/openstack/blockstorage/v3/transfers/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/transfers/testing/fixtures_test.go
@@ -167,7 +167,7 @@ func HandleCreateTransfer(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 }
 
@@ -179,7 +179,7 @@ func HandleAcceptTransfer(t *testing.T) {
 		th.TestJSONRequest(t, r, AcceptTransferRequest)
 
 		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, AcceptTransferResponse)
+		fmt.Fprint(w, AcceptTransferResponse)
 	})
 }
 
@@ -200,7 +200,7 @@ func HandleListTransfers(t *testing.T) {
 		th.TestFormValues(t, r, map[string]string{"all_tenants": "true"})
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -211,6 +211,6 @@ func HandleGetTransfer(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
diff --git a/openstack/blockstorage/v3/volumes/testing/fixtures_test.go b/openstack/blockstorage/v3/volumes/testing/fixtures_test.go
index 4efb9e08f4..9b4630a978 100644
--- a/openstack/blockstorage/v3/volumes/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/volumes/testing/fixtures_test.go
@@ -95,7 +95,7 @@ func MockListResponse(t *testing.T) {
 }
   `, th.Server.URL)
 		case "1":
-			fmt.Fprintf(w, `{"volumes": []}`)
+			fmt.Fprint(w, `{"volumes": []}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -109,7 +109,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "volume": {
     "volume_type": "lvmdriver-1",
@@ -171,7 +171,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "volume": {
     "size": 75,
@@ -211,7 +211,7 @@ func MockUpdateResponse(t *testing.T) {
 		th.TestMethod(t, r, "PUT")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "volume": {
     "name": "vol-002"
@@ -239,7 +239,7 @@ func MockCreateVolumeFromBackupResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "volume": {
     "size": 30,
@@ -287,7 +287,7 @@ func MockAttachResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -307,7 +307,7 @@ func MockBeginDetachingResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -327,7 +327,7 @@ func MockDetachResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -352,7 +352,7 @@ func MockUploadImageResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `
+			fmt.Fprint(w, `
 {
     "os-volume_upload_image": {
         "container_format": "bare",
@@ -399,7 +399,7 @@ func MockReserveResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -419,7 +419,7 @@ func MockUnreserveResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -450,7 +450,7 @@ func MockInitializeConnectionResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{
+			fmt.Fprint(w, `{
 "connection_info": {
     "data": {
       "target_portals": [
@@ -507,7 +507,7 @@ func MockTerminateConnectionResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -530,7 +530,7 @@ func MockExtendSizeResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
@@ -561,7 +561,7 @@ func MockSetImageMetadataResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `{}`)
+		fmt.Fprint(w, `{}`)
 	})
 }
 
@@ -624,7 +624,7 @@ func MockChangeTypeResponse(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusAccepted)
 
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
 
diff --git a/openstack/blockstorage/v3/volumetypes/testing/fixtures_test.go b/openstack/blockstorage/v3/volumetypes/testing/fixtures_test.go
index e1db5dfbd4..c7eb37893e 100644
--- a/openstack/blockstorage/v3/volumetypes/testing/fixtures_test.go
+++ b/openstack/blockstorage/v3/volumetypes/testing/fixtures_test.go
@@ -58,7 +58,7 @@ func MockListResponse(t *testing.T) {
 }
   `, th.Server.URL)
 		case "1":
-			fmt.Fprintf(w, `{"volume_types": []}`)
+			fmt.Fprint(w, `{"volume_types": []}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -72,7 +72,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "volume_type": {
         "id": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
@@ -112,7 +112,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "volume_type": {
         "name": "test_type",
@@ -143,7 +143,7 @@ func MockUpdateResponse(t *testing.T) {
 		th.TestMethod(t, r, "PUT")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "volume_type": {
         "name": "vol-type-002",
@@ -203,7 +203,7 @@ func HandleExtraSpecsListSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ExtraSpecsGetBody)
+		fmt.Fprint(w, ExtraSpecsGetBody)
 	})
 }
 
@@ -215,7 +215,7 @@ func HandleExtraSpecGetSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetExtraSpecBody)
+		fmt.Fprint(w, GetExtraSpecBody)
 	})
 }
 
@@ -233,7 +233,7 @@ func HandleExtraSpecsCreateSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ExtraSpecsGetBody)
+		fmt.Fprint(w, ExtraSpecsGetBody)
 	})
 }
 
@@ -248,7 +248,7 @@ func HandleExtraSpecUpdateSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdatedExtraSpecBody)
+		fmt.Fprint(w, UpdatedExtraSpecBody)
 	})
 }
 
@@ -281,7 +281,7 @@ func MockEncryptionCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "encryption": {
         "volume_type_id": "a5082c24-2a27-43a4-b48e-fcec1240e36b",
@@ -324,7 +324,7 @@ func MockEncryptionUpdateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "encryption": {
         "control_location": "front-end",
@@ -345,7 +345,7 @@ func MockEncryptionGetResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "volume_type_id": "a5082c24-2a27-43a4-b48e-fcec1240e36b",
     "control_location": "front-end",
@@ -370,7 +370,7 @@ func MockEncryptionGetSpecResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "cipher": "aes-xts-plain64"
 }
diff --git a/openstack/blockstorage/v3/volumetypes/testing/requests_test.go b/openstack/blockstorage/v3/volumetypes/testing/requests_test.go
index 56f22632f9..f222be2395 100644
--- a/openstack/blockstorage/v3/volumetypes/testing/requests_test.go
+++ b/openstack/blockstorage/v3/volumetypes/testing/requests_test.go
@@ -190,7 +190,7 @@ func TestVolumeTypeListAccesses(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 			  "volume_type_access": [
 			    {
diff --git a/openstack/common/extensions/testing/fixtures.go b/openstack/common/extensions/testing/fixtures.go
index cfcdbe90e9..91f6a041b1 100644
--- a/openstack/common/extensions/testing/fixtures.go
+++ b/openstack/common/extensions/testing/fixtures.go
@@ -71,7 +71,7 @@ func HandleListExtensionsSuccessfully(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -85,6 +85,6 @@ func HandleGetExtensionSuccessfully(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
diff --git a/openstack/compute/apiversions/testing/fixtures_test.go b/openstack/compute/apiversions/testing/fixtures_test.go
index c7f4b1a977..49162c77ce 100644
--- a/openstack/compute/apiversions/testing/fixtures_test.go
+++ b/openstack/compute/apiversions/testing/fixtures_test.go
@@ -169,7 +169,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, NovaAllAPIVersionsResponse)
+		fmt.Fprint(w, NovaAllAPIVersionsResponse)
 	})
 }
 
@@ -181,7 +181,7 @@ func MockGetResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, NovaAPIVersionResponse_21)
+		fmt.Fprint(w, NovaAPIVersionResponse_21)
 	})
 }
 
@@ -193,6 +193,6 @@ func MockGetMultipleResponses(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, NovaAPIInvalidVersionResponse)
+		fmt.Fprint(w, NovaAPIInvalidVersionResponse)
 	})
 }
diff --git a/openstack/compute/v2/aggregates/testing/fixtures_test.go b/openstack/compute/v2/aggregates/testing/fixtures_test.go
index a67678404f..11cebc8915 100644
--- a/openstack/compute/v2/aggregates/testing/fixtures_test.go
+++ b/openstack/compute/v2/aggregates/testing/fixtures_test.go
@@ -264,7 +264,7 @@ func HandleListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, AggregateListBody)
+		fmt.Fprint(w, AggregateListBody)
 	})
 }
 
@@ -274,7 +274,7 @@ func HandleCreateSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, AggregateCreateBody)
+		fmt.Fprint(w, AggregateCreateBody)
 	})
 }
 
@@ -295,7 +295,7 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, AggregateGetBody)
+		fmt.Fprint(w, AggregateGetBody)
 	})
 }
 
@@ -306,7 +306,7 @@ func HandleUpdateSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, AggregateUpdateBody)
+		fmt.Fprint(w, AggregateUpdateBody)
 	})
 }
 
@@ -317,7 +317,7 @@ func HandleAddHostSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, AggregateAddHostBody)
+		fmt.Fprint(w, AggregateAddHostBody)
 	})
 }
 
@@ -328,7 +328,7 @@ func HandleRemoveHostSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, AggregateRemoveHostBody)
+		fmt.Fprint(w, AggregateRemoveHostBody)
 	})
 }
 
@@ -339,6 +339,6 @@ func HandleSetMetadataSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, AggregateSetMetadataBody)
+		fmt.Fprint(w, AggregateSetMetadataBody)
 	})
 }
diff --git a/openstack/compute/v2/attachinterfaces/testing/fixtures_test.go b/openstack/compute/v2/attachinterfaces/testing/fixtures_test.go
index 77bc48f55e..59a03d57d2 100644
--- a/openstack/compute/v2/attachinterfaces/testing/fixtures_test.go
+++ b/openstack/compute/v2/attachinterfaces/testing/fixtures_test.go
@@ -69,7 +69,7 @@ func HandleInterfaceListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"interfaceAttachments": [
 				{
 					"port_state":"ACTIVE",
@@ -99,7 +99,7 @@ func HandleInterfaceGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"interfaceAttachment":
 				{
 					"port_state":"ACTIVE",
@@ -133,7 +133,7 @@ func HandleInterfaceCreateSuccessfully(t *testing.T) {
 		}`)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"interfaceAttachment":
 				{
 					"port_state":"ACTIVE",
diff --git a/openstack/compute/v2/availabilityzones/testing/fixtures_test.go b/openstack/compute/v2/availabilityzones/testing/fixtures_test.go
index 059364bcc0..a36c64649c 100644
--- a/openstack/compute/v2/availabilityzones/testing/fixtures_test.go
+++ b/openstack/compute/v2/availabilityzones/testing/fixtures_test.go
@@ -180,7 +180,7 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -192,6 +192,6 @@ func HandleGetDetailSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetDetailOutput)
+		fmt.Fprint(w, GetDetailOutput)
 	})
 }
diff --git a/openstack/compute/v2/extensions/testing/fixtures_test.go b/openstack/compute/v2/extensions/testing/fixtures_test.go
index 6827dab20c..b1622af764 100644
--- a/openstack/compute/v2/extensions/testing/fixtures_test.go
+++ b/openstack/compute/v2/extensions/testing/fixtures_test.go
@@ -16,7 +16,7 @@ func HandleListExtensionsSuccessfully(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 		"extensions": [
 				{
@@ -41,7 +41,7 @@ func HandleGetExtensionsSuccessfully(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 		"extension": {
 				"updated": "2013-02-03T10:00:00-00:00",
diff --git a/openstack/compute/v2/flavors/testing/fixtures_test.go b/openstack/compute/v2/flavors/testing/fixtures_test.go
index 94ac8c8a59..a92cdcd1d8 100644
--- a/openstack/compute/v2/flavors/testing/fixtures_test.go
+++ b/openstack/compute/v2/flavors/testing/fixtures_test.go
@@ -57,7 +57,7 @@ func HandleExtraSpecsListSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ExtraSpecsGetBody)
+		fmt.Fprint(w, ExtraSpecsGetBody)
 	})
 }
 
@@ -69,7 +69,7 @@ func HandleExtraSpecGetSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetExtraSpecBody)
+		fmt.Fprint(w, GetExtraSpecBody)
 	})
 }
 
@@ -87,7 +87,7 @@ func HandleExtraSpecsCreateSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ExtraSpecsGetBody)
+		fmt.Fprint(w, ExtraSpecsGetBody)
 	})
 }
 
@@ -102,7 +102,7 @@ func HandleExtraSpecUpdateSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdatedExtraSpecBody)
+		fmt.Fprint(w, UpdatedExtraSpecBody)
 	})
 }
 
diff --git a/openstack/compute/v2/flavors/testing/requests_test.go b/openstack/compute/v2/flavors/testing/requests_test.go
index d22e3dfa9c..efd6e4bcee 100644
--- a/openstack/compute/v2/flavors/testing/requests_test.go
+++ b/openstack/compute/v2/flavors/testing/requests_test.go
@@ -76,7 +76,7 @@ func TestListFlavors(t *testing.T) {
 					}
 				`, th.Server.URL)
 		case "2":
-			fmt.Fprintf(w, `{ "flavors": [] }`)
+			fmt.Fprint(w, `{ "flavors": [] }`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -121,7 +121,7 @@ func TestGetFlavor(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 				"flavor": {
 					"id": "1",
@@ -170,7 +170,7 @@ func TestCreateFlavor(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 				"flavor": {
 					"id": "1",
@@ -225,7 +225,7 @@ func TestUpdateFlavor(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 				"flavor": {
 					"id": "1",
@@ -288,7 +288,7 @@ func TestFlavorAccessesList(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 			  "flavor_access": [
 			    {
@@ -336,7 +336,7 @@ func TestFlavorAccessAdd(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 			  "flavor_access": [
 			    {
@@ -385,7 +385,7 @@ func TestFlavorAccessRemove(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 			  "flavor_access": []
 			}
diff --git a/openstack/compute/v2/hypervisors/testing/fixtures_test.go b/openstack/compute/v2/hypervisors/testing/fixtures_test.go
index 6e4b2e4aff..fa0b93a3f8 100644
--- a/openstack/compute/v2/hypervisors/testing/fixtures_test.go
+++ b/openstack/compute/v2/hypervisors/testing/fixtures_test.go
@@ -605,7 +605,7 @@ func HandleHypervisorsStatisticsSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, HypervisorsStatisticsBody)
+		fmt.Fprint(w, HypervisorsStatisticsBody)
 	})
 }
 
@@ -615,7 +615,7 @@ func HandleHypervisorListPre253Successfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, HypervisorListBodyPre253)
+		fmt.Fprint(w, HypervisorListBodyPre253)
 	})
 }
 
@@ -625,7 +625,7 @@ func HandleHypervisorListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, HypervisorListBody)
+		fmt.Fprint(w, HypervisorListBody)
 	})
 }
 
@@ -638,7 +638,7 @@ func HandleHypervisorListWithParametersSuccessfully(t *testing.T) {
 		})
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, HypervisorListWithParametersBody)
+		fmt.Fprint(w, HypervisorListWithParametersBody)
 	})
 }
 
@@ -648,7 +648,7 @@ func HandleHypervisorGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, HypervisorGetBody)
+		fmt.Fprint(w, HypervisorGetBody)
 	})
 }
 
@@ -658,7 +658,7 @@ func HandleHypervisorGetEmptyCPUInfoSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, HypervisorGetEmptyCPUInfoBody)
+		fmt.Fprint(w, HypervisorGetEmptyCPUInfoBody)
 	})
 }
 
@@ -668,7 +668,7 @@ func HandleHypervisorAfterV287ResponseSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, HypervisorAfterV287ResponseBody)
+		fmt.Fprint(w, HypervisorAfterV287ResponseBody)
 	})
 }
 
@@ -678,6 +678,6 @@ func HandleHypervisorUptimeSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, HypervisorUptimeBody)
+		fmt.Fprint(w, HypervisorUptimeBody)
 	})
 }
diff --git a/openstack/compute/v2/instanceactions/testing/fixtures_test.go b/openstack/compute/v2/instanceactions/testing/fixtures_test.go
index 3b24801c38..cbbf6def28 100644
--- a/openstack/compute/v2/instanceactions/testing/fixtures_test.go
+++ b/openstack/compute/v2/instanceactions/testing/fixtures_test.go
@@ -40,7 +40,7 @@ func HandleInstanceActionListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"instanceActions": [
 				{
 					"action": "stop",
@@ -100,7 +100,7 @@ func HandleInstanceActionGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"instanceAction": 
 			{
 				"action": "stop",
diff --git a/openstack/compute/v2/keypairs/testing/fixtures_test.go b/openstack/compute/v2/keypairs/testing/fixtures_test.go
index 41532c03cc..92460e9259 100644
--- a/openstack/compute/v2/keypairs/testing/fixtures_test.go
+++ b/openstack/compute/v2/keypairs/testing/fixtures_test.go
@@ -157,7 +157,7 @@ func HandleListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -169,11 +169,11 @@ func HandleGetSuccessfully(t *testing.T) {
 
 		if r.URL.Query().Get("user_id") == "fake2" {
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, GetOutputOtherUser)
+			fmt.Fprint(w, GetOutputOtherUser)
 
 		} else {
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, GetOutput)
+			fmt.Fprint(w, GetOutput)
 
 		}
 	})
@@ -188,7 +188,7 @@ func HandleCreateSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, `{ "keypair": { "name": "createdkey" } }`)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, CreateOutput)
+		fmt.Fprint(w, CreateOutput)
 	})
 }
 
@@ -201,7 +201,7 @@ func HandleCreateSuccessfullyOtherUser(t *testing.T) {
 		th.TestJSONRequest(t, r, `{ "keypair": { "name": "createdkey", "user_id": "fake2" } }`)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, CreateOutputOtherUser)
+		fmt.Fprint(w, CreateOutputOtherUser)
 	})
 }
 
@@ -221,7 +221,7 @@ func HandleImportSuccessfully(t *testing.T) {
 		`)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, ImportOutput)
+		fmt.Fprint(w, ImportOutput)
 	})
 }
 
diff --git a/openstack/compute/v2/limits/testing/fixtures_test.go b/openstack/compute/v2/limits/testing/fixtures_test.go
index 3751c2d8b6..ee04c72442 100644
--- a/openstack/compute/v2/limits/testing/fixtures_test.go
+++ b/openstack/compute/v2/limits/testing/fixtures_test.go
@@ -75,6 +75,6 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
diff --git a/openstack/compute/v2/quotasets/testing/fixtures_test.go b/openstack/compute/v2/quotasets/testing/fixtures_test.go
index d1c714714b..5d0ef24931 100644
--- a/openstack/compute/v2/quotasets/testing/fixtures_test.go
+++ b/openstack/compute/v2/quotasets/testing/fixtures_test.go
@@ -167,7 +167,7 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -177,7 +177,7 @@ func HandleGetDetailSuccessfully(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetDetailsOutput)
+		fmt.Fprint(w, GetDetailsOutput)
 	})
 }
 
@@ -188,7 +188,7 @@ func HandlePutSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestJSONRequest(t, r, UpdateOutput)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
 
@@ -199,7 +199,7 @@ func HandlePartialPutSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestJSONRequest(t, r, PartialUpdateBody)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
 
diff --git a/openstack/compute/v2/remoteconsoles/testing/requests_test.go b/openstack/compute/v2/remoteconsoles/testing/requests_test.go
index e96b897d0f..3a49e4d46f 100644
--- a/openstack/compute/v2/remoteconsoles/testing/requests_test.go
+++ b/openstack/compute/v2/remoteconsoles/testing/requests_test.go
@@ -25,7 +25,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, RemoteConsoleCreateResult)
+		fmt.Fprint(w, RemoteConsoleCreateResult)
 	})
 
 	opts := remoteconsoles.CreateOpts{
diff --git a/openstack/compute/v2/secgroups/testing/fixtures_test.go b/openstack/compute/v2/secgroups/testing/fixtures_test.go
index 0b35cc71d8..df3614b66b 100644
--- a/openstack/compute/v2/secgroups/testing/fixtures_test.go
+++ b/openstack/compute/v2/secgroups/testing/fixtures_test.go
@@ -33,7 +33,7 @@ func mockListGroupsResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, listGroupsJSON)
+		fmt.Fprint(w, listGroupsJSON)
 	})
 }
 
@@ -46,7 +46,7 @@ func mockListGroupsByServerResponse(t *testing.T, serverID string) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, listGroupsJSON)
+		fmt.Fprint(w, listGroupsJSON)
 	})
 }
 
@@ -67,7 +67,7 @@ func mockCreateGroupResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "security_group": {
     "description": "something",
@@ -99,7 +99,7 @@ func mockUpdateGroupResponse(t *testing.T, groupID string) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "security_group": {
     "description": "something",
@@ -122,7 +122,7 @@ func mockGetGroupsResponse(t *testing.T, groupID string) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "security_group": {
     "description": "default",
@@ -224,7 +224,7 @@ func mockAddRuleResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "security_group_rule": {
     "from_port": 22,
@@ -260,7 +260,7 @@ func mockAddRuleResponseICMPZero(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "security_group_rule": {
     "from_port": 0,
diff --git a/openstack/compute/v2/servergroups/testing/fixtures_test.go b/openstack/compute/v2/servergroups/testing/fixtures_test.go
index de36c3ff89..2ad519023a 100644
--- a/openstack/compute/v2/servergroups/testing/fixtures_test.go
+++ b/openstack/compute/v2/servergroups/testing/fixtures_test.go
@@ -148,7 +148,7 @@ func HandleListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -160,7 +160,7 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -172,7 +172,7 @@ func HandleGetMicroversionSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutputMicroversion)
+		fmt.Fprint(w, GetOutputMicroversion)
 	})
 }
 
@@ -194,7 +194,7 @@ func HandleCreateSuccessfully(t *testing.T) {
 `)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, CreateOutput)
+		fmt.Fprint(w, CreateOutput)
 	})
 }
 
@@ -220,7 +220,7 @@ func HandleCreateMicroversionSuccessfully(t *testing.T) {
 `)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, CreateOutputMicroversion)
+		fmt.Fprint(w, CreateOutputMicroversion)
 	})
 }
 
diff --git a/openstack/compute/v2/servers/testing/fixtures_test.go b/openstack/compute/v2/servers/testing/fixtures_test.go
index 2ce6282b02..1c25b40074 100644
--- a/openstack/compute/v2/servers/testing/fixtures_test.go
+++ b/openstack/compute/v2/servers/testing/fixtures_test.go
@@ -741,7 +741,7 @@ func HandleServerNoNetworkCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -761,7 +761,7 @@ func HandleServerCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 
 	th.Mux.HandleFunc("/images/detail", func(w http.ResponseWriter, r *http.Request) {
@@ -775,7 +775,7 @@ func HandleServerCreationSuccessfully(t *testing.T, response string) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, `
+			fmt.Fprint(w, `
 				{
 					"images": [
 						{
@@ -804,7 +804,7 @@ func HandleServerCreationSuccessfully(t *testing.T, response string) {
 				}
 			`)
 		case "2":
-			fmt.Fprintf(w, `{ "images": [] }`)
+			fmt.Fprint(w, `{ "images": [] }`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -850,7 +850,7 @@ func HandleServerCreationSuccessfully(t *testing.T, response string) {
 						}
 					`, th.Server.URL)
 		case "2":
-			fmt.Fprintf(w, `{ "flavors": [] }`)
+			fmt.Fprint(w, `{ "flavors": [] }`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -875,7 +875,7 @@ func HandleServersCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -896,7 +896,7 @@ func HandleServerCreationWithCustomFieldSuccessfully(t *testing.T, response stri
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -915,7 +915,7 @@ func HandleServerCreationWithHostname(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -936,7 +936,7 @@ func HandleServerCreationWithUserdata(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -959,7 +959,7 @@ func HandleServerCreationWithMetadata(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -976,9 +976,9 @@ func HandleServerListSimpleSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, ServerListBody)
+			fmt.Fprint(w, ServerListBody)
 		case "9e5476bd-a4ec-4653-93d6-72c93aa682ba":
-			fmt.Fprintf(w, `{ "servers": [] }`)
+			fmt.Fprint(w, `{ "servers": [] }`)
 		default:
 			t.Fatalf("/servers invoked with unexpected marker=[%s]", marker)
 		}
@@ -998,9 +998,9 @@ func HandleServerListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, ServerListBody)
+			fmt.Fprint(w, ServerListBody)
 		case "9e5476bd-a4ec-4653-93d6-72c93aa682ba":
-			fmt.Fprintf(w, `{ "servers": [] }`)
+			fmt.Fprint(w, `{ "servers": [] }`)
 		default:
 			t.Fatalf("/servers/detail invoked with unexpected marker=[%s]", marker)
 		}
@@ -1036,7 +1036,7 @@ func HandleServerGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleServerBody)
+		fmt.Fprint(w, SingleServerBody)
 	})
 }
 
@@ -1048,7 +1048,7 @@ func HandleServerGetFaultSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, FaultyServerBody)
+		fmt.Fprint(w, FaultyServerBody)
 	})
 }
 
@@ -1061,7 +1061,7 @@ func HandleServerUpdateSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "Content-Type", "application/json")
 		th.TestJSONRequest(t, r, `{ "server": { "name": "new-name" } }`)
 
-		fmt.Fprintf(w, SingleServerBody)
+		fmt.Fprint(w, SingleServerBody)
 	})
 }
 
@@ -1097,7 +1097,7 @@ func HandleShowConsoleOutputSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusOK)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -1119,7 +1119,7 @@ func HandleRebuildSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -1243,7 +1243,7 @@ func HandleAddressListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"addresses": {
 				"public": [
 				{
@@ -1285,7 +1285,7 @@ func HandleNetworkAddressListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"public": [
 			{
 				"version": 4,
@@ -1317,7 +1317,7 @@ func HandlePasswordGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, ServerPasswordBody)
+		fmt.Fprint(w, ServerPasswordBody)
 	})
 }
 
@@ -1332,6 +1332,6 @@ func HandleServerWithTagsCreationSuccessfully(t *testing.T) {
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
 
-		fmt.Fprintf(w, SingleServerWithTagsBody)
+		fmt.Fprint(w, SingleServerWithTagsBody)
 	})
 }
diff --git a/openstack/compute/v2/services/testing/fixtures_test.go b/openstack/compute/v2/services/testing/fixtures_test.go
index 2104dc08cb..93b124df90 100644
--- a/openstack/compute/v2/services/testing/fixtures_test.go
+++ b/openstack/compute/v2/services/testing/fixtures_test.go
@@ -259,7 +259,7 @@ func HandleListPre253Successfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, ServiceListBodyPre253)
+		fmt.Fprint(w, ServiceListBodyPre253)
 	})
 }
 
@@ -271,7 +271,7 @@ func HandleListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, ServiceListBody)
+		fmt.Fprint(w, ServiceListBody)
 	})
 }
 
@@ -285,7 +285,7 @@ func HandleUpdateSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "Content-Type", "application/json")
 		th.TestJSONRequest(t, r, `{"status": "disabled"}`)
 
-		fmt.Fprintf(w, ServiceUpdate)
+		fmt.Fprint(w, ServiceUpdate)
 	})
 }
 
diff --git a/openstack/compute/v2/tags/testing/requests_test.go b/openstack/compute/v2/tags/testing/requests_test.go
index 03f4260a7d..dc524a2306 100644
--- a/openstack/compute/v2/tags/testing/requests_test.go
+++ b/openstack/compute/v2/tags/testing/requests_test.go
@@ -22,7 +22,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		_, err := fmt.Fprintf(w, TagsListResponse)
+		_, err := fmt.Fprint(w, TagsListResponse)
 		th.AssertNoErr(t, err)
 	})
 
@@ -78,7 +78,7 @@ func TestReplaceAll(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		_, err := fmt.Fprintf(w, TagsReplaceAllResponse)
+		_, err := fmt.Fprint(w, TagsReplaceAllResponse)
 		th.AssertNoErr(t, err)
 	})
 
diff --git a/openstack/compute/v2/volumeattach/testing/fixtures_test.go b/openstack/compute/v2/volumeattach/testing/fixtures_test.go
index c5f0435a96..d9ada1e8c1 100644
--- a/openstack/compute/v2/volumeattach/testing/fixtures_test.go
+++ b/openstack/compute/v2/volumeattach/testing/fixtures_test.go
@@ -62,7 +62,7 @@ func HandleListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -74,7 +74,7 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -96,7 +96,7 @@ func HandleCreateSuccessfully(t *testing.T) {
 `)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, CreateOutput)
+		fmt.Fprint(w, CreateOutput)
 	})
 }
 
diff --git a/openstack/container/v1/capsules/testing/fixtures_test.go b/openstack/container/v1/capsules/testing/fixtures_test.go
index fe7b008013..779a41a0df 100644
--- a/openstack/container/v1/capsules/testing/fixtures_test.go
+++ b/openstack/container/v1/capsules/testing/fixtures_test.go
@@ -609,7 +609,7 @@ func HandleCapsuleGetOldTimeSuccessfully(t *testing.T) {
 
 		w.WriteHeader(http.StatusOK)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, CapsuleGetBody_OldTime)
+		fmt.Fprint(w, CapsuleGetBody_OldTime)
 	})
 }
 
@@ -621,7 +621,7 @@ func HandleCapsuleGetNewTimeSuccessfully(t *testing.T) {
 
 		w.WriteHeader(http.StatusOK)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, CapsuleGetBody_NewTime)
+		fmt.Fprint(w, CapsuleGetBody_NewTime)
 	})
 }
 
@@ -633,7 +633,7 @@ func HandleCapsuleCreateSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fakeclient.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, CapsuleGetBody_NewTime)
+		fmt.Fprint(w, CapsuleGetBody_NewTime)
 	})
 }
 
@@ -645,7 +645,7 @@ func HandleCapsuleListSuccessfully(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, CapsuleListBody)
+		fmt.Fprint(w, CapsuleListBody)
 	})
 }
 
@@ -657,7 +657,7 @@ func HandleCapsuleV132ListSuccessfully(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, CapsuleV132ListBody)
+		fmt.Fprint(w, CapsuleV132ListBody)
 	})
 }
 
diff --git a/openstack/containerinfra/apiversions/testing/fixtures_test.go b/openstack/containerinfra/apiversions/testing/fixtures_test.go
index e95058151d..f42844214c 100644
--- a/openstack/containerinfra/apiversions/testing/fixtures_test.go
+++ b/openstack/containerinfra/apiversions/testing/fixtures_test.go
@@ -71,7 +71,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, MagnumAllAPIVersionsResponse)
+		fmt.Fprint(w, MagnumAllAPIVersionsResponse)
 	})
 }
 
@@ -83,6 +83,6 @@ func MockGetResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, MagnumAPIVersionResponse)
+		fmt.Fprint(w, MagnumAPIVersionResponse)
 	})
 }
diff --git a/openstack/containerinfra/v1/certificates/testing/fixtures_test.go b/openstack/containerinfra/v1/certificates/testing/fixtures_test.go
index 3f88c34242..b51d77cbd4 100644
--- a/openstack/containerinfra/v1/certificates/testing/fixtures_test.go
+++ b/openstack/containerinfra/v1/certificates/testing/fixtures_test.go
@@ -106,6 +106,6 @@ func HandleUpdateCertificateSuccessfully(t *testing.T) {
 			th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
 			w.WriteHeader(http.StatusAccepted)
-			fmt.Fprintf(w, `{}`)
+			fmt.Fprint(w, `{}`)
 		})
 }
diff --git a/openstack/containerinfra/v1/nodegroups/testing/fixtures_test.go b/openstack/containerinfra/v1/nodegroups/testing/fixtures_test.go
index 51e63cc318..90de8b6fe6 100644
--- a/openstack/containerinfra/v1/nodegroups/testing/fixtures_test.go
+++ b/openstack/containerinfra/v1/nodegroups/testing/fixtures_test.go
@@ -221,7 +221,7 @@ func handleCreateNodeGroupSuccess(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, nodeGroupCreateResponse)
+		fmt.Fprint(w, nodeGroupCreateResponse)
 	})
 }
 
@@ -233,7 +233,7 @@ func handleCreateNodeGroupDuplicate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusConflict)
 
-		fmt.Fprintf(w, nodeGroupCreateDuplicateResponse)
+		fmt.Fprint(w, nodeGroupCreateDuplicateResponse)
 	})
 }
 
@@ -245,7 +245,7 @@ func handleCreateNodeGroupMaster(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)
 
-		fmt.Fprintf(w, nodeGroupCreateMasterResponse)
+		fmt.Fprint(w, nodeGroupCreateMasterResponse)
 	})
 }
 
@@ -257,7 +257,7 @@ func handleCreateNodeGroupBadSizes(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusConflict)
 
-		fmt.Fprintf(w, nodeGroupCreateBadSizesResponse)
+		fmt.Fprint(w, nodeGroupCreateBadSizesResponse)
 	})
 }
 
@@ -269,7 +269,7 @@ func handleUpdateNodeGroupSuccess(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, nodeGroupUpdateResponse)
+		fmt.Fprint(w, nodeGroupUpdateResponse)
 	})
 }
 
@@ -281,7 +281,7 @@ func handleUpdateNodeGroupInternal(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)
 
-		fmt.Fprintf(w, nodeGroupUpdateInternalResponse)
+		fmt.Fprint(w, nodeGroupUpdateInternalResponse)
 	})
 }
 
@@ -293,7 +293,7 @@ func handleUpdateNodeGroupBadField(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)
 
-		fmt.Fprintf(w, nodeGroupUpdateBadFieldResponse)
+		fmt.Fprint(w, nodeGroupUpdateBadFieldResponse)
 	})
 }
 
@@ -305,7 +305,7 @@ func handleUpdateNodeGroupBadMin(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusConflict)
 
-		fmt.Fprintf(w, nodeGroupUpdateBadMinResponse)
+		fmt.Fprint(w, nodeGroupUpdateBadMinResponse)
 	})
 }
 
@@ -326,7 +326,7 @@ func handleDeleteNodeGroupNotFound(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusNotFound)
 
-		fmt.Fprintf(w, nodeGroupDeleteNotFoundResponse)
+		fmt.Fprint(w, nodeGroupDeleteNotFoundResponse)
 	})
 }
 
@@ -338,7 +338,7 @@ func handleDeleteNodeGroupClusterNotFound(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusNotFound)
 
-		fmt.Fprintf(w, nodeGroupDeleteClusterNotFoundResponse)
+		fmt.Fprint(w, nodeGroupDeleteClusterNotFoundResponse)
 	})
 }
 
@@ -350,7 +350,7 @@ func handleDeleteNodeGroupDefault(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)
 
-		fmt.Fprintf(w, nodeGroupDeleteDefaultResponse)
+		fmt.Fprint(w, nodeGroupDeleteDefaultResponse)
 	})
 }
 
diff --git a/openstack/dns/v2/recordsets/testing/fixtures_test.go b/openstack/dns/v2/recordsets/testing/fixtures_test.go
index 9d2289f100..71d1d0898e 100644
--- a/openstack/dns/v2/recordsets/testing/fixtures_test.go
+++ b/openstack/dns/v2/recordsets/testing/fixtures_test.go
@@ -212,9 +212,9 @@ func HandleListByZoneSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "f7b10e9b-0cae-4a91-b162-562bc6096648":
-			fmt.Fprintf(w, ListByZoneOutputLimited)
+			fmt.Fprint(w, ListByZoneOutputLimited)
 		case "":
-			fmt.Fprintf(w, ListByZoneOutput)
+			fmt.Fprint(w, ListByZoneOutput)
 		}
 	})
 }
@@ -227,7 +227,7 @@ func HandleGetSuccessfully(t *testing.T) {
 			th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, GetOutput)
+			fmt.Fprint(w, GetOutput)
 		})
 }
 
@@ -282,7 +282,7 @@ func HandleCreateSuccessfully(t *testing.T) {
 
 			w.WriteHeader(http.StatusCreated)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, CreateRecordSetResponse)
+			fmt.Fprint(w, CreateRecordSetResponse)
 		})
 }
 
@@ -334,7 +334,7 @@ func HandleUpdateSuccessfully(t *testing.T) {
 
 			w.WriteHeader(http.StatusOK)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, UpdateRecordSetResponse)
+			fmt.Fprint(w, UpdateRecordSetResponse)
 		})
 }
 
@@ -373,6 +373,6 @@ func HandleDeleteSuccessfully(t *testing.T) {
 
 			w.WriteHeader(http.StatusAccepted)
 			//w.Header().Add("Content-Type", "application/json")
-			//fmt.Fprintf(w, DeleteZoneResponse)
+			//fmt.Fprint(w, DeleteZoneResponse)
 		})
 }
diff --git a/openstack/dns/v2/transfer/accept/testing/fixtures_test.go b/openstack/dns/v2/transfer/accept/testing/fixtures_test.go
index b8c3fe5888..3dae54e6aa 100644
--- a/openstack/dns/v2/transfer/accept/testing/fixtures_test.go
+++ b/openstack/dns/v2/transfer/accept/testing/fixtures_test.go
@@ -133,7 +133,7 @@ func HandleListSuccessfully(t *testing.T) {
 			th.TestMethod(t, r, "GET")
 			th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, ListOutput)
+			fmt.Fprint(w, ListOutput)
 		})
 }
 
@@ -145,7 +145,7 @@ func HandleFilteredListSuccessfully(t *testing.T) {
 			th.TestMethod(t, r, "GET")
 			th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, FilteredListOutput)
+			fmt.Fprint(w, FilteredListOutput)
 		})
 }
 
@@ -157,7 +157,7 @@ func HandleGetSuccessfully(t *testing.T) {
 			th.TestMethod(t, r, "GET")
 			th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, GetOutput)
+			fmt.Fprint(w, GetOutput)
 		})
 }
 
@@ -200,6 +200,6 @@ func HandleCreateSuccessfully(t *testing.T) {
 
 			w.WriteHeader(http.StatusCreated)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, CreateTransferAcceptResponse)
+			fmt.Fprint(w, CreateTransferAcceptResponse)
 		})
 }
diff --git a/openstack/dns/v2/transfer/request/testing/fixtures_test.go b/openstack/dns/v2/transfer/request/testing/fixtures_test.go
index 758b566604..3de1f2aca3 100644
--- a/openstack/dns/v2/transfer/request/testing/fixtures_test.go
+++ b/openstack/dns/v2/transfer/request/testing/fixtures_test.go
@@ -119,7 +119,7 @@ func HandleListSuccessfully(t *testing.T) {
 			th.TestMethod(t, r, "GET")
 			th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, ListOutput)
+			fmt.Fprint(w, ListOutput)
 		})
 }
 
@@ -131,7 +131,7 @@ func HandleGetSuccessfully(t *testing.T) {
 			th.TestMethod(t, r, "GET")
 			th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, GetOutput)
+			fmt.Fprint(w, GetOutput)
 		})
 }
 
@@ -175,7 +175,7 @@ func HandleCreateSuccessfully(t *testing.T) {
 
 			w.WriteHeader(http.StatusCreated)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, CreateTransferRequestResponse)
+			fmt.Fprint(w, CreateTransferRequestResponse)
 		})
 }
 
@@ -215,7 +215,7 @@ func HandleUpdateSuccessfully(t *testing.T) {
 
 			w.WriteHeader(http.StatusOK)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, UpdatedTransferRequestResponse)
+			fmt.Fprint(w, UpdatedTransferRequestResponse)
 		})
 }
 
diff --git a/openstack/dns/v2/zones/testing/fixtures_test.go b/openstack/dns/v2/zones/testing/fixtures_test.go
index d7d9120643..6b0ee7ccf7 100644
--- a/openstack/dns/v2/zones/testing/fixtures_test.go
+++ b/openstack/dns/v2/zones/testing/fixtures_test.go
@@ -149,7 +149,7 @@ func HandleListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -160,7 +160,7 @@ func HandleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -212,7 +212,7 @@ func HandleCreateSuccessfully(t *testing.T) {
 
 		w.WriteHeader(http.StatusCreated)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, CreateZoneResponse)
+		fmt.Fprint(w, CreateZoneResponse)
 	})
 }
 
@@ -259,7 +259,7 @@ func HandleUpdateSuccessfully(t *testing.T) {
 
 			w.WriteHeader(http.StatusOK)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, UpdateZoneResponse)
+			fmt.Fprint(w, UpdateZoneResponse)
 		})
 }
 
@@ -297,6 +297,6 @@ func HandleDeleteSuccessfully(t *testing.T) {
 
 			w.WriteHeader(http.StatusAccepted)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, DeleteZoneResponse)
+			fmt.Fprint(w, DeleteZoneResponse)
 		})
 }
diff --git a/openstack/identity/v2/extensions/testing/fixtures_test.go b/openstack/identity/v2/extensions/testing/fixtures_test.go
index 3733eba312..8e9bfa14da 100644
--- a/openstack/identity/v2/extensions/testing/fixtures_test.go
+++ b/openstack/identity/v2/extensions/testing/fixtures_test.go
@@ -37,7 +37,7 @@ func HandleListExtensionsSuccessfully(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "extensions": {
     "values": [
diff --git a/openstack/identity/v2/roles/testing/fixtures_test.go b/openstack/identity/v2/roles/testing/fixtures_test.go
index 0b5af6e541..170e80099c 100644
--- a/openstack/identity/v2/roles/testing/fixtures_test.go
+++ b/openstack/identity/v2/roles/testing/fixtures_test.go
@@ -17,7 +17,7 @@ func MockListRoleResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "roles": [
         {
diff --git a/openstack/identity/v2/tenants/testing/fixtures_test.go b/openstack/identity/v2/tenants/testing/fixtures_test.go
index 7c50152faa..e7de74ccd5 100644
--- a/openstack/identity/v2/tenants/testing/fixtures_test.go
+++ b/openstack/identity/v2/tenants/testing/fixtures_test.go
@@ -59,7 +59,7 @@ func HandleListTenantsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -81,7 +81,7 @@ func mockCreateTenantResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "tenant": {
         "name": "new_tenant",
@@ -120,7 +120,7 @@ func mockUpdateTenantResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 		"tenant": {
 				"name": "new_name",
@@ -141,7 +141,7 @@ func mockGetTenantResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 		"tenant": {
 				"name": "new_tenant",
diff --git a/openstack/identity/v2/tokens/testing/fixtures_test.go b/openstack/identity/v2/tokens/testing/fixtures_test.go
index 8eb7d6f7ea..1ee6d32e75 100644
--- a/openstack/identity/v2/tokens/testing/fixtures_test.go
+++ b/openstack/identity/v2/tokens/testing/fixtures_test.go
@@ -152,7 +152,7 @@ func HandleTokenPost(t *testing.T, requestJSON string) {
 		}
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, TokenCreationResponse)
+		fmt.Fprint(w, TokenCreationResponse)
 	})
 }
 
@@ -165,7 +165,7 @@ func HandleTokenGet(t *testing.T, token string) {
 		th.TestHeader(t, r, "X-Auth-Token", thclient.TokenID)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, TokenGetResponse)
+		fmt.Fprint(w, TokenGetResponse)
 	})
 }
 
diff --git a/openstack/identity/v2/users/testing/fixtures_test.go b/openstack/identity/v2/users/testing/fixtures_test.go
index f38f05dba2..3e5285360b 100644
--- a/openstack/identity/v2/users/testing/fixtures_test.go
+++ b/openstack/identity/v2/users/testing/fixtures_test.go
@@ -17,7 +17,7 @@ func MockListUserResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "users":[
         {
@@ -61,7 +61,7 @@ func mockCreateUserResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "user": {
         "name": "new_user",
@@ -83,7 +83,7 @@ func mockGetUserResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 		"user": {
 				"name": "new_user",
@@ -115,7 +115,7 @@ func mockUpdateUserResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 		"user": {
 				"name": "new_name",
@@ -145,7 +145,7 @@ func mockListRolesResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "roles": [
         {
diff --git a/openstack/identity/v3/applicationcredentials/testing/fixtures_test.go b/openstack/identity/v3/applicationcredentials/testing/fixtures_test.go
index fabb021a0c..ae06c1bc57 100644
--- a/openstack/identity/v3/applicationcredentials/testing/fixtures_test.go
+++ b/openstack/identity/v3/applicationcredentials/testing/fixtures_test.go
@@ -415,7 +415,7 @@ func HandleListApplicationCredentialsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -429,7 +429,7 @@ func HandleGetApplicationCredentialSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -442,7 +442,7 @@ func HandleCreateApplicationCredentialSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 }
 
@@ -455,7 +455,7 @@ func HandleCreateNoSecretApplicationCredentialSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateNoSecretRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateNoSecretResponse)
+		fmt.Fprint(w, CreateNoSecretResponse)
 	})
 }
 
@@ -466,7 +466,7 @@ func HandleCreateUnrestrictedApplicationCredentialSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateUnrestrictedRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateUnrestrictedResponse)
+		fmt.Fprint(w, CreateUnrestrictedResponse)
 	})
 }
 
@@ -491,7 +491,7 @@ func HandleListAccessRulesSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListAccessRulesOutput)
+		fmt.Fprint(w, ListAccessRulesOutput)
 	})
 }
 
@@ -505,7 +505,7 @@ func HandleGetAccessRuleSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetAccessRuleOutput)
+		fmt.Fprint(w, GetAccessRuleOutput)
 	})
 }
 
diff --git a/openstack/identity/v3/catalog/testing/fixtures_test.go b/openstack/identity/v3/catalog/testing/fixtures_test.go
index 541fcac4af..ad9e9d9ce2 100644
--- a/openstack/identity/v3/catalog/testing/fixtures_test.go
+++ b/openstack/identity/v3/catalog/testing/fixtures_test.go
@@ -85,6 +85,6 @@ func HandleListCatalogSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		_, _ = fmt.Fprintf(w, ListOutput)
+		_, _ = fmt.Fprint(w, ListOutput)
 	})
 }
diff --git a/openstack/identity/v3/credentials/testing/fixtures_test.go b/openstack/identity/v3/credentials/testing/fixtures_test.go
index 8da4769ed6..e32d77d0db 100644
--- a/openstack/identity/v3/credentials/testing/fixtures_test.go
+++ b/openstack/identity/v3/credentials/testing/fixtures_test.go
@@ -161,7 +161,7 @@ func HandleListCredentialsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -175,7 +175,7 @@ func HandleGetCredentialSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -188,7 +188,7 @@ func HandleCreateCredentialSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -212,6 +212,6 @@ func HandleUpdateCredentialSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
diff --git a/openstack/identity/v3/domains/testing/fixtures_test.go b/openstack/identity/v3/domains/testing/fixtures_test.go
index f5025a15c8..a35813a23c 100644
--- a/openstack/identity/v3/domains/testing/fixtures_test.go
+++ b/openstack/identity/v3/domains/testing/fixtures_test.go
@@ -189,7 +189,7 @@ func HandleListAvailableDomainsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListAvailableOutput)
+		fmt.Fprint(w, ListAvailableOutput)
 	})
 }
 
@@ -203,7 +203,7 @@ func HandleListDomainsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -217,7 +217,7 @@ func HandleGetDomainSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -230,7 +230,7 @@ func HandleCreateDomainSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -254,6 +254,6 @@ func HandleUpdateDomainSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
diff --git a/openstack/identity/v3/ec2credentials/testing/fixtures_test.go b/openstack/identity/v3/ec2credentials/testing/fixtures_test.go
index 738161477d..72a82e1ff4 100644
--- a/openstack/identity/v3/ec2credentials/testing/fixtures_test.go
+++ b/openstack/identity/v3/ec2credentials/testing/fixtures_test.go
@@ -119,7 +119,7 @@ func HandleListEC2CredentialsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -133,7 +133,7 @@ func HandleGetEC2CredentialSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -146,7 +146,7 @@ func HandleCreateEC2CredentialSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 }
 
diff --git a/openstack/identity/v3/ec2tokens/testing/requests_test.go b/openstack/identity/v3/ec2tokens/testing/requests_test.go
index 13239e2d91..8fe0b3c3f8 100644
--- a/openstack/identity/v3/ec2tokens/testing/requests_test.go
+++ b/openstack/identity/v3/ec2tokens/testing/requests_test.go
@@ -32,7 +32,7 @@ func authTokenPost(t *testing.T, options ec2tokens.AuthOptions, requestJSON stri
 		th.TestJSONRequest(t, r, requestJSON)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, tokens_testing.TokenOutput)
+		fmt.Fprint(w, tokens_testing.TokenOutput)
 	})
 
 	expected := &tokens.Token{
diff --git a/openstack/identity/v3/endpoints/testing/requests_test.go b/openstack/identity/v3/endpoints/testing/requests_test.go
index 8ea857bad4..348a1f1c6e 100644
--- a/openstack/identity/v3/endpoints/testing/requests_test.go
+++ b/openstack/identity/v3/endpoints/testing/requests_test.go
@@ -33,7 +33,7 @@ func TestCreateSuccessful(t *testing.T) {
     `)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
       {
         "endpoint": {
           "id": "12",
@@ -82,7 +82,7 @@ func TestListEndpoints(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 				"endpoints": [
 					{
@@ -170,7 +170,7 @@ func TestUpdateEndpoint(t *testing.T) {
 		}
 	`)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 		{
 			"endpoint": {
 				"id": "12",
diff --git a/openstack/identity/v3/federation/testing/fixtures_test.go b/openstack/identity/v3/federation/testing/fixtures_test.go
index 225cc57997..229d2f489a 100644
--- a/openstack/identity/v3/federation/testing/fixtures_test.go
+++ b/openstack/identity/v3/federation/testing/fixtures_test.go
@@ -289,7 +289,7 @@ func HandleListMappingsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -302,7 +302,7 @@ func HandleCreateMappingSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateOutput)
+		fmt.Fprint(w, CreateOutput)
 	})
 }
 
@@ -316,7 +316,7 @@ func HandleGetMappingSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -329,7 +329,7 @@ func HandleUpdateMappingSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
 
diff --git a/openstack/identity/v3/groups/testing/fixtures_test.go b/openstack/identity/v3/groups/testing/fixtures_test.go
index 0357a1fe06..415d81555f 100644
--- a/openstack/identity/v3/groups/testing/fixtures_test.go
+++ b/openstack/identity/v3/groups/testing/fixtures_test.go
@@ -160,7 +160,7 @@ func HandleListGroupsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -174,7 +174,7 @@ func HandleGetGroupSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -187,7 +187,7 @@ func HandleCreateGroupSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -200,7 +200,7 @@ func HandleUpdateGroupSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
 
diff --git a/openstack/identity/v3/limits/testing/fixtures_test.go b/openstack/identity/v3/limits/testing/fixtures_test.go
index 6275235b54..5f8cbff160 100644
--- a/openstack/identity/v3/limits/testing/fixtures_test.go
+++ b/openstack/identity/v3/limits/testing/fixtures_test.go
@@ -183,7 +183,7 @@ func HandleGetEnforcementModelSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetEnforcementModelOutput)
+		fmt.Fprint(w, GetEnforcementModelOutput)
 	})
 }
 
@@ -197,7 +197,7 @@ func HandleListLimitsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -210,7 +210,7 @@ func HandleCreateLimitSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateOutput)
+		fmt.Fprint(w, CreateOutput)
 	})
 }
 
@@ -224,7 +224,7 @@ func HandleGetLimitSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -237,7 +237,7 @@ func HandleUpdateLimitSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
 
diff --git a/openstack/identity/v3/oauth1/testing/fixtures_test.go b/openstack/identity/v3/oauth1/testing/fixtures_test.go
index 3e8d144047..b8d5dc3327 100644
--- a/openstack/identity/v3/oauth1/testing/fixtures_test.go
+++ b/openstack/identity/v3/oauth1/testing/fixtures_test.go
@@ -228,7 +228,7 @@ func HandleCreateConsumer(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateConsumerRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		_, err := fmt.Fprintf(w, CreateConsumerResponse)
+		_, err := fmt.Fprint(w, CreateConsumerResponse)
 		th.AssertNoErr(t, err)
 	})
 }
@@ -243,7 +243,7 @@ func HandleUpdateConsumer(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateConsumerRequest)
 
 		w.WriteHeader(http.StatusOK)
-		_, err := fmt.Fprintf(w, UpdateConsumerResponse)
+		_, err := fmt.Fprint(w, UpdateConsumerResponse)
 		th.AssertNoErr(t, err)
 	})
 }
@@ -269,7 +269,7 @@ func HandleGetConsumer(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetConsumerResponse)
+		fmt.Fprint(w, GetConsumerResponse)
 	})
 }
 
@@ -306,7 +306,7 @@ func HandleListConsumers(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListConsumersResponse)
+		fmt.Fprint(w, ListConsumersResponse)
 	})
 }
 
@@ -329,7 +329,7 @@ func HandleRequestToken(t *testing.T) {
 
 		w.Header().Set("Content-Type", oauth1.OAuth1TokenContentType)
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `oauth_token=29971f&oauth_token_secret=238eb8&oauth_expires_at=2013-09-11T06:07:51.501805Z`)
+		fmt.Fprint(w, `oauth_token=29971f&oauth_token_secret=238eb8&oauth_expires_at=2013-09-11T06:07:51.501805Z`)
 	})
 }
 
@@ -343,7 +343,7 @@ func HandleAuthorizeToken(t *testing.T) {
 		th.TestJSONRequest(t, r, AuthorizeTokenRequest)
 
 		w.WriteHeader(http.StatusOK)
-		_, err := fmt.Fprintf(w, AuthorizeTokenResponse)
+		_, err := fmt.Fprint(w, AuthorizeTokenResponse)
 		th.AssertNoErr(t, err)
 	})
 }
@@ -366,7 +366,7 @@ func HandleCreateAccessToken(t *testing.T) {
 
 		w.Header().Set("Content-Type", oauth1.OAuth1TokenContentType)
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `oauth_token=accd36&oauth_token_secret=aa47da&oauth_expires_at=2013-09-11T06:07:51.501805Z`)
+		fmt.Fprint(w, `oauth_token=accd36&oauth_token_secret=aa47da&oauth_expires_at=2013-09-11T06:07:51.501805Z`)
 	})
 }
 
@@ -380,7 +380,7 @@ func HandleGetAccessToken(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetUserAccessTokenResponse)
+		fmt.Fprint(w, GetUserAccessTokenResponse)
 	})
 }
 
@@ -405,7 +405,7 @@ func HandleListAccessTokens(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListUserAccessTokensResponse)
+		fmt.Fprint(w, ListUserAccessTokensResponse)
 	})
 }
 
@@ -419,7 +419,7 @@ func HandleListAccessTokenRoles(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListUserAccessTokenRolesResponse)
+		fmt.Fprint(w, ListUserAccessTokenRolesResponse)
 	})
 }
 
@@ -433,7 +433,7 @@ func HandleGetAccessTokenRole(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListUserAccessTokenRoleResponse)
+		fmt.Fprint(w, ListUserAccessTokenRoleResponse)
 	})
 }
 
@@ -449,6 +449,6 @@ func HandleAuthenticate(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, tokens.TokenOutput)
+		fmt.Fprint(w, tokens.TokenOutput)
 	})
 }
diff --git a/openstack/identity/v3/policies/testing/fixtures_test.go b/openstack/identity/v3/policies/testing/fixtures_test.go
index 2ebc6c6c41..d261ed865c 100644
--- a/openstack/identity/v3/policies/testing/fixtures_test.go
+++ b/openstack/identity/v3/policies/testing/fixtures_test.go
@@ -164,9 +164,9 @@ func HandleListPoliciesSuccessfully(t *testing.T) {
 		w.WriteHeader(http.StatusOK)
 		switch r.URL.Query().Get("type") {
 		case "":
-			fmt.Fprintf(w, ListOutput)
+			fmt.Fprint(w, ListOutput)
 		case "application/json":
-			fmt.Fprintf(w, ListWithFilterOutput)
+			fmt.Fprint(w, ListWithFilterOutput)
 		default:
 			w.WriteHeader(http.StatusBadRequest)
 		}
@@ -182,7 +182,7 @@ func HandleCreatePolicySuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -197,7 +197,7 @@ func HandleGetPolicySuccessfully(t *testing.T) {
 
 			w.Header().Set("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			fmt.Fprintf(w, GetOutput)
+			fmt.Fprint(w, GetOutput)
 		},
 	)
 }
@@ -212,7 +212,7 @@ func HandleUpdatePolicySuccessfully(t *testing.T) {
 			th.TestJSONRequest(t, r, UpdateRequest)
 
 			w.WriteHeader(http.StatusOK)
-			fmt.Fprintf(w, UpdateOutput)
+			fmt.Fprint(w, UpdateOutput)
 		},
 	)
 }
diff --git a/openstack/identity/v3/projectendpoints/testing/requests_test.go b/openstack/identity/v3/projectendpoints/testing/requests_test.go
index 9a9c17139f..2e8f6aad4c 100644
--- a/openstack/identity/v3/projectendpoints/testing/requests_test.go
+++ b/openstack/identity/v3/projectendpoints/testing/requests_test.go
@@ -37,7 +37,7 @@ func TestListEndpoints(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 		{
 			"endpoints": [
 				{
diff --git a/openstack/identity/v3/projects/testing/fixtures_test.go b/openstack/identity/v3/projects/testing/fixtures_test.go
index a54edfe21f..568305008a 100644
--- a/openstack/identity/v3/projects/testing/fixtures_test.go
+++ b/openstack/identity/v3/projects/testing/fixtures_test.go
@@ -285,7 +285,7 @@ func HandleListAvailableProjectsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListAvailableOutput)
+		fmt.Fprint(w, ListAvailableOutput)
 	})
 }
 
@@ -299,7 +299,7 @@ func HandleListProjectsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -313,7 +313,7 @@ func HandleGetProjectSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -326,7 +326,7 @@ func HandleCreateProjectSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -350,7 +350,7 @@ func HandleUpdateProjectSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
 
@@ -360,7 +360,7 @@ func HandleListProjectTagsSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListTagsOutput)
+		fmt.Fprint(w, ListTagsOutput)
 	})
 }
 
@@ -371,7 +371,7 @@ func HandleModifyProjectTagsSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, ModifyProjectTagsRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ModifyProjectTagsOutput)
+		fmt.Fprint(w, ModifyProjectTagsOutput)
 	})
 }
 func HandleDeleteProjectTagsSuccessfully(t *testing.T) {
diff --git a/openstack/identity/v3/regions/testing/fixtures_test.go b/openstack/identity/v3/regions/testing/fixtures_test.go
index a4c3a40c38..633ae86dcb 100644
--- a/openstack/identity/v3/regions/testing/fixtures_test.go
+++ b/openstack/identity/v3/regions/testing/fixtures_test.go
@@ -172,7 +172,7 @@ func HandleListRegionsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -186,7 +186,7 @@ func HandleGetRegionSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -199,7 +199,7 @@ func HandleCreateRegionSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -212,7 +212,7 @@ func HandleUpdateRegionSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
 
diff --git a/openstack/identity/v3/registeredlimits/testing/fixtures_test.go b/openstack/identity/v3/registeredlimits/testing/fixtures_test.go
index 37e11ed6eb..1bcfc5e867 100644
--- a/openstack/identity/v3/registeredlimits/testing/fixtures_test.go
+++ b/openstack/identity/v3/registeredlimits/testing/fixtures_test.go
@@ -163,7 +163,7 @@ func HandleListRegisteredLimitsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -177,7 +177,7 @@ func HandleGetRegisteredLimitSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -190,7 +190,7 @@ func HandleCreateRegisteredLimitSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateOutput)
+		fmt.Fprint(w, CreateOutput)
 	})
 }
 
@@ -214,6 +214,6 @@ func HandleUpdateRegisteredLimitSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
diff --git a/openstack/identity/v3/roles/testing/fixtures_test.go b/openstack/identity/v3/roles/testing/fixtures_test.go
index 755f14d4e8..32fe745a94 100644
--- a/openstack/identity/v3/roles/testing/fixtures_test.go
+++ b/openstack/identity/v3/roles/testing/fixtures_test.go
@@ -350,7 +350,7 @@ func HandleListRolesSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -364,7 +364,7 @@ func HandleGetRoleSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -377,7 +377,7 @@ func HandleCreateRoleSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -390,7 +390,7 @@ func HandleUpdateRoleSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
 
@@ -499,7 +499,7 @@ func HandleListRoleAssignmentsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListAssignmentOutput)
+		fmt.Fprint(w, ListAssignmentOutput)
 	})
 }
 
@@ -514,7 +514,7 @@ func HandleListRoleAssignmentsWithNamesSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListAssignmentWithNamesOutput)
+		fmt.Fprint(w, ListAssignmentWithNamesOutput)
 	})
 }
 
@@ -529,7 +529,7 @@ func HandleListRoleAssignmentsWithSubtreeSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListAssignmentOutput)
+		fmt.Fprint(w, ListAssignmentOutput)
 	})
 }
 
@@ -557,7 +557,7 @@ func HandleListAssignmentsOnResourceSuccessfully_ProjectsUsers(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListAssignmentsOnResourceOutput)
+		fmt.Fprint(w, ListAssignmentsOnResourceOutput)
 	}
 
 	th.Mux.HandleFunc("/projects/{project_id}/users/{user_id}/roles", fn)
@@ -571,7 +571,7 @@ func HandleListAssignmentsOnResourceSuccessfully_ProjectsGroups(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListAssignmentsOnResourceOutput)
+		fmt.Fprint(w, ListAssignmentsOnResourceOutput)
 	}
 
 	th.Mux.HandleFunc("/projects/{project_id}/groups/{group_id}/roles", fn)
@@ -585,7 +585,7 @@ func HandleListAssignmentsOnResourceSuccessfully_DomainsUsers(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListAssignmentsOnResourceOutput)
+		fmt.Fprint(w, ListAssignmentsOnResourceOutput)
 	}
 
 	th.Mux.HandleFunc("/domains/{domain_id}/users/{user_id}/roles", fn)
@@ -599,7 +599,7 @@ func HandleListAssignmentsOnResourceSuccessfully_DomainsGroups(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListAssignmentsOnResourceOutput)
+		fmt.Fprint(w, ListAssignmentsOnResourceOutput)
 	}
 
 	th.Mux.HandleFunc("/domains/{domain_id}/groups/{group_id}/roles", fn)
@@ -635,7 +635,7 @@ func HandleCreateRoleInferenceRule(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateRoleInferenceRuleOutput)
+		fmt.Fprint(w, CreateRoleInferenceRuleOutput)
 	}
 
 	th.Mux.HandleFunc("/roles/7ceab6192ea34a548cc71b24f72e762c/implies/97e2f5d38bc94842bc3da818c16762ed", fn)
@@ -713,7 +713,7 @@ func HandleListRoleInferenceRules(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListRoleInferenceRulesOutput)
+		fmt.Fprint(w, ListRoleInferenceRulesOutput)
 	}
 
 	th.Mux.HandleFunc("/role_inferences", fn)
@@ -737,7 +737,7 @@ func HandleGetRoleInferenceRule(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, CreateRoleInferenceRuleOutput)
+		fmt.Fprint(w, CreateRoleInferenceRuleOutput)
 	}
 
 	th.Mux.HandleFunc("/roles/7ceab6192ea34a548cc71b24f72e762c/implies/97e2f5d38bc94842bc3da818c16762ed", fn)
diff --git a/openstack/identity/v3/services/testing/fixtures_test.go b/openstack/identity/v3/services/testing/fixtures_test.go
index da713482f8..0a9274c500 100644
--- a/openstack/identity/v3/services/testing/fixtures_test.go
+++ b/openstack/identity/v3/services/testing/fixtures_test.go
@@ -164,7 +164,7 @@ func HandleListServicesSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -178,7 +178,7 @@ func HandleGetServiceSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -191,7 +191,7 @@ func HandleCreateServiceSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -204,6 +204,6 @@ func HandleUpdateServiceSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
diff --git a/openstack/identity/v3/tokens/testing/requests_test.go b/openstack/identity/v3/tokens/testing/requests_test.go
index c0aafb9ad4..8bb00fbffa 100644
--- a/openstack/identity/v3/tokens/testing/requests_test.go
+++ b/openstack/identity/v3/tokens/testing/requests_test.go
@@ -30,7 +30,7 @@ func authTokenPost(t *testing.T, options tokens.AuthOptions, scope *tokens.Scope
 		th.TestJSONRequest(t, r, requestJSON)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"token": {
 				"expires_at": "2014-10-02T13:45:00.000000Z"
 			}
@@ -369,7 +369,7 @@ func TestCreateUserIDPasswordTrustID(t *testing.T) {
 		th.TestJSONRequest(t, r, requestJSON)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, responseJSON)
+		fmt.Fprint(w, responseJSON)
 	})
 
 	ao := gophercloud.AuthOptions{
@@ -525,7 +525,7 @@ func TestCreateExtractsTokenFromResponse(t *testing.T) {
 		w.Header().Add("X-Subject-Token", "aaa111")
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"token": {
 				"expires_at": "2014-10-02T13:45:00.000000Z"
 			}
@@ -670,7 +670,7 @@ func TestGetRequest(t *testing.T) {
 		th.TestHeader(t, r, "X-Subject-Token", "abcdef12345")
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{ "token": { "expires_at": "2014-08-29T13:10:01.000000Z" } }
 		`)
 	})
@@ -779,7 +779,7 @@ func TestNoTokenInResponse(t *testing.T) {
 
 	th.Mux.HandleFunc("/auth/tokens", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `{}`)
+		fmt.Fprint(w, `{}`)
 	})
 
 	options := tokens.AuthOptions{UserID: "me", Password: "squirrel!"}
diff --git a/openstack/identity/v3/trusts/testing/fixtures_test.go b/openstack/identity/v3/trusts/testing/fixtures_test.go
index 6cc9a8a7d1..3e7e77fc3c 100644
--- a/openstack/identity/v3/trusts/testing/fixtures_test.go
+++ b/openstack/identity/v3/trusts/testing/fixtures_test.go
@@ -207,7 +207,7 @@ func HandleCreateTrust(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		_, err := fmt.Fprintf(w, CreateResponse)
+		_, err := fmt.Fprint(w, CreateResponse)
 		th.AssertNoErr(t, err)
 	})
 }
@@ -221,7 +221,7 @@ func HandleCreateTrustNoExpire(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequestNoExpire)
 
 		w.WriteHeader(http.StatusCreated)
-		_, err := fmt.Fprintf(w, CreateResponseNoExpire)
+		_, err := fmt.Fprint(w, CreateResponseNoExpire)
 		th.AssertNoErr(t, err)
 	})
 }
@@ -247,7 +247,7 @@ func HandleGetTrustSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
 
@@ -317,7 +317,7 @@ func HandleListTrustsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 }
 
@@ -331,7 +331,7 @@ func HandleListTrustRolesSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListTrustRolesResponse)
+		fmt.Fprint(w, ListTrustRolesResponse)
 	})
 }
 
@@ -345,7 +345,7 @@ func HandleGetTrustRoleSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetTrustRoleResponse)
+		fmt.Fprint(w, GetTrustRoleResponse)
 	})
 }
 
diff --git a/openstack/identity/v3/users/testing/fixtures_test.go b/openstack/identity/v3/users/testing/fixtures_test.go
index 023124cb79..faff58d4d0 100644
--- a/openstack/identity/v3/users/testing/fixtures_test.go
+++ b/openstack/identity/v3/users/testing/fixtures_test.go
@@ -382,7 +382,7 @@ func HandleListUsersSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -396,7 +396,7 @@ func HandleGetUserSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -409,7 +409,7 @@ func HandleCreateUserSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
 
@@ -422,7 +422,7 @@ func HandleCreateNoOptionsUserSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateNoOptionsRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetOutputNoOptions)
+		fmt.Fprint(w, GetOutputNoOptions)
 	})
 }
 
@@ -435,7 +435,7 @@ func HandleUpdateUserSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateOutput)
+		fmt.Fprint(w, UpdateOutput)
 	})
 }
 
@@ -472,7 +472,7 @@ func HandleListUserGroupsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListGroupsOutput)
+		fmt.Fprint(w, ListGroupsOutput)
 	})
 }
 
@@ -519,7 +519,7 @@ func HandleListUserProjectsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListProjectsOutput)
+		fmt.Fprint(w, ListProjectsOutput)
 	})
 }
 
@@ -533,6 +533,6 @@ func HandleListInGroupSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
diff --git a/openstack/image/v2/imageimport/testing/requests_test.go b/openstack/image/v2/imageimport/testing/requests_test.go
index ae353ad0ac..74df12e548 100644
--- a/openstack/image/v2/imageimport/testing/requests_test.go
+++ b/openstack/image/v2/imageimport/testing/requests_test.go
@@ -22,7 +22,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ImportGetResult)
+		fmt.Fprint(w, ImportGetResult)
 	})
 
 	validImportMethods := []string{
@@ -49,7 +49,7 @@ func TestCreate(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, `{}`)
+		fmt.Fprint(w, `{}`)
 	})
 
 	opts := imageimport.CreateOpts{
diff --git a/openstack/image/v2/images/testing/fixtures_test.go b/openstack/image/v2/images/testing/fixtures_test.go
index 0c9a7b0318..693f6b9965 100644
--- a/openstack/image/v2/images/testing/fixtures_test.go
+++ b/openstack/image/v2/images/testing/fixtures_test.go
@@ -130,7 +130,7 @@ func HandleImageListSuccessfully(t *testing.T) {
 		addNext := false
 		var imageJSON []string
 
-		fmt.Fprintf(w, `{"images": [`)
+		fmt.Fprint(w, `{"images": [`)
 
 		for _, i := range images {
 			if marker == "" || addNext {
@@ -149,7 +149,7 @@ func HandleImageListSuccessfully(t *testing.T) {
 			}
 		}
 		t.Logf("Writing out %v image(s)", len(imageJSON))
-		fmt.Fprintf(w, strings.Join(imageJSON, ","))
+		fmt.Fprint(w, strings.Join(imageJSON, ","))
 
 		fmt.Fprintf(w, `],
 			    "next": "/images?marker=%s&limit=%v",
@@ -176,7 +176,7 @@ func HandleImageCreationSuccessfully(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"status": "queued",
 			"name": "Ubuntu 12.10",
 			"protected": false,
@@ -224,7 +224,7 @@ func HandleImageCreationSuccessfullyNulls(t *testing.T) {
 		w.Header().Set("OpenStack-image-import-methods", "glance-direct,web-download")
 		w.Header().Set("OpenStack-image-store-ids", "123,456")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"architecture": "x86_64",
 			"status": "queued",
 			"name": "Ubuntu 12.10",
@@ -258,7 +258,7 @@ func HandleImageGetSuccessfully(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"status": "active",
 			"name": "cirros-0.3.2-x86_64-disk",
 			"tags": [],
@@ -347,7 +347,7 @@ func HandleImageUpdateSuccessfully(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"id": "da3b75d9-3f4a-40e7-8a2c-bfab23927dea",
 			"name": "Fedora 17",
 			"status": "active",
@@ -389,7 +389,7 @@ func HandleImageListByTagsSuccessfully(t *testing.T) {
 
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
     "images": [
         {
           "status": "active",
@@ -449,7 +449,7 @@ func HandleImageUpdatePropertiesSuccessfully(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"id": "da3b75d9-3f4a-40e7-8a2c-bfab23927dea",
 			"name": "Fedora 17",
 			"status": "active",
diff --git a/openstack/image/v2/members/testing/fixtures_test.go b/openstack/image/v2/members/testing/fixtures_test.go
index 4100b186f4..6e0bd326e7 100644
--- a/openstack/image/v2/members/testing/fixtures_test.go
+++ b/openstack/image/v2/members/testing/fixtures_test.go
@@ -18,7 +18,7 @@ func HandleCreateImageMemberSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, `{"member": "8989447062e04a818baf9e073fd04fa7"}`)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 		    "created_at": "2013-09-20T19:22:19Z",
 		    "image_id": "da3b75d9-3f4a-40e7-8a2c-bfab23927dea",
 		    "member_id": "8989447062e04a818baf9e073fd04fa7",
@@ -37,7 +37,7 @@ func HandleImageMemberList(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fakeclient.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 		    "members": [
 		        {
 		            "created_at": "2013-10-07T17:58:03Z",
@@ -68,7 +68,7 @@ func HandleImageMemberEmptyList(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fakeclient.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 		    "members": [],
 		    "schema": "/v2/schemas/members"
 		}`)
@@ -82,7 +82,7 @@ func HandleImageMemberDetails(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fakeclient.TokenID)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 		    "status": "pending",
 		    "created_at": "2013-11-26T07:21:21Z",
 		    "updated_at": "2013-11-26T07:21:21Z",
@@ -120,7 +120,7 @@ func HandleImageMemberUpdate(t *testing.T) *CallsCounter {
 
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 		    "status": "accepted",
 		    "created_at": "2013-11-26T07:21:21Z",
 		    "updated_at": "2013-11-26T07:21:21Z",
diff --git a/openstack/image/v2/tasks/testing/requests_test.go b/openstack/image/v2/tasks/testing/requests_test.go
index feb74068bc..f930304427 100644
--- a/openstack/image/v2/tasks/testing/requests_test.go
+++ b/openstack/image/v2/tasks/testing/requests_test.go
@@ -24,7 +24,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, TasksListResult)
+		fmt.Fprint(w, TasksListResult)
 	})
 
 	count := 0
@@ -64,7 +64,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, TasksGetResult)
+		fmt.Fprint(w, TasksGetResult)
 	})
 
 	s, err := tasks.Get(context.TODO(), fakeclient.ServiceClient(), "1252f636-1246-4319-bfba-c47cde0efbe0").Extract()
@@ -102,7 +102,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, TaskCreateResult)
+		fmt.Fprint(w, TaskCreateResult)
 	})
 
 	opts := tasks.CreateOpts{
diff --git a/openstack/keymanager/v1/acls/testing/fixtures_test.go b/openstack/keymanager/v1/acls/testing/fixtures_test.go
index 7db2b37b4f..89b6ea7d4d 100644
--- a/openstack/keymanager/v1/acls/testing/fixtures_test.go
+++ b/openstack/keymanager/v1/acls/testing/fixtures_test.go
@@ -75,7 +75,7 @@ func HandleGetSecretACLSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
 
@@ -89,7 +89,7 @@ func HandleGetContainerACLSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
 
@@ -102,7 +102,7 @@ func HandleSetSecretACLSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, SetRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, SecretSetResponse)
+		fmt.Fprint(w, SecretSetResponse)
 	})
 }
 
@@ -115,7 +115,7 @@ func HandleSetContainerACLSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, SetRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ContainerSetResponse)
+		fmt.Fprint(w, ContainerSetResponse)
 	})
 }
 
@@ -128,7 +128,7 @@ func HandleUpdateSecretACLSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, SecretSetResponse)
+		fmt.Fprint(w, SecretSetResponse)
 	})
 }
 
@@ -141,7 +141,7 @@ func HandleUpdateContainerACLSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ContainerSetResponse)
+		fmt.Fprint(w, ContainerSetResponse)
 	})
 }
 
diff --git a/openstack/keymanager/v1/containers/testing/fixtures_test.go b/openstack/keymanager/v1/containers/testing/fixtures_test.go
index 4b3997f786..d290a5a9a6 100644
--- a/openstack/keymanager/v1/containers/testing/fixtures_test.go
+++ b/openstack/keymanager/v1/containers/testing/fixtures_test.go
@@ -235,7 +235,7 @@ func HandleListContainersSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 }
 
@@ -249,7 +249,7 @@ func HandleGetContainerSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
 
@@ -262,7 +262,7 @@ func HandleCreateContainerSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
 
@@ -288,7 +288,7 @@ func HandleListConsumersSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListConsumersResponse)
+		fmt.Fprint(w, ListConsumersResponse)
 	})
 }
 
@@ -302,7 +302,7 @@ func HandleCreateConsumerSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateConsumerRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, CreateConsumerResponse)
+		fmt.Fprint(w, CreateConsumerResponse)
 	})
 }
 
@@ -316,6 +316,6 @@ func HandleDeleteConsumerSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateConsumerRequest)
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
diff --git a/openstack/keymanager/v1/orders/testing/fixtures_test.go b/openstack/keymanager/v1/orders/testing/fixtures_test.go
index 636fe7eb3f..7eb14e0edf 100644
--- a/openstack/keymanager/v1/orders/testing/fixtures_test.go
+++ b/openstack/keymanager/v1/orders/testing/fixtures_test.go
@@ -143,7 +143,7 @@ func HandleListOrdersSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 }
 
@@ -157,7 +157,7 @@ func HandleGetOrderSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
 
@@ -170,7 +170,7 @@ func HandleCreateOrderSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
 
diff --git a/openstack/keymanager/v1/secrets/testing/fixtures_test.go b/openstack/keymanager/v1/secrets/testing/fixtures_test.go
index ff13102354..ed0e9ffad0 100644
--- a/openstack/keymanager/v1/secrets/testing/fixtures_test.go
+++ b/openstack/keymanager/v1/secrets/testing/fixtures_test.go
@@ -198,7 +198,7 @@ func HandleListSecretsSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 }
 
@@ -212,7 +212,7 @@ func HandleGetSecretSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 }
 
@@ -225,7 +225,7 @@ func HandleGetPayloadSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "text/plain")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetPayloadResponse)
+		fmt.Fprint(w, GetPayloadResponse)
 	})
 }
 
@@ -238,7 +238,7 @@ func HandleCreateSecretSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 }
 
@@ -277,7 +277,7 @@ func HandleGetMetadataSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetMetadataResponse)
+		fmt.Fprint(w, GetMetadataResponse)
 	})
 }
 
@@ -293,7 +293,7 @@ func HandleCreateMetadataSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateMetadataResponse)
+		fmt.Fprint(w, CreateMetadataResponse)
 	})
 }
 
@@ -308,7 +308,7 @@ func HandleGetMetadatumSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, MetadatumResponse)
+		fmt.Fprint(w, MetadatumResponse)
 	})
 }
 
@@ -324,7 +324,7 @@ func HandleCreateMetadatumSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, MetadatumResponse)
+		fmt.Fprint(w, MetadatumResponse)
 	})
 }
 
@@ -340,7 +340,7 @@ func HandleUpdateMetadatumSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, MetadatumResponse)
+		fmt.Fprint(w, MetadatumResponse)
 	})
 }
 
diff --git a/openstack/loadbalancer/v2/amphorae/testing/fixtures_test.go b/openstack/loadbalancer/v2/amphorae/testing/fixtures_test.go
index 8ffafa253e..049f0697bf 100644
--- a/openstack/loadbalancer/v2/amphorae/testing/fixtures_test.go
+++ b/openstack/loadbalancer/v2/amphorae/testing/fixtures_test.go
@@ -150,9 +150,9 @@ func HandleAmphoraListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, AmphoraeListBody)
+			fmt.Fprint(w, AmphoraeListBody)
 		case "7f890893-ced0-46ed-8697-33415d070e5a":
-			fmt.Fprintf(w, `{ "amphorae": [] }`)
+			fmt.Fprint(w, `{ "amphorae": [] }`)
 		default:
 			t.Fatalf("/v2.0/octavia/amphorae invoked with unexpected marker=[%s]", marker)
 		}
@@ -166,7 +166,7 @@ func HandleAmphoraGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleAmphoraBody)
+		fmt.Fprint(w, SingleAmphoraBody)
 	})
 }
 
diff --git a/openstack/loadbalancer/v2/apiversions/testing/fixture.go b/openstack/loadbalancer/v2/apiversions/testing/fixture.go
index d21507dbab..b427378d95 100644
--- a/openstack/loadbalancer/v2/apiversions/testing/fixture.go
+++ b/openstack/loadbalancer/v2/apiversions/testing/fixture.go
@@ -88,6 +88,6 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, OctaviaAllAPIVersionsResponse)
+		fmt.Fprint(w, OctaviaAllAPIVersionsResponse)
 	})
 }
diff --git a/openstack/loadbalancer/v2/flavorprofiles/testing/fixtures.go b/openstack/loadbalancer/v2/flavorprofiles/testing/fixtures.go
index adbdf1b7b3..3558a21919 100644
--- a/openstack/loadbalancer/v2/flavorprofiles/testing/fixtures.go
+++ b/openstack/loadbalancer/v2/flavorprofiles/testing/fixtures.go
@@ -94,9 +94,9 @@ func HandleFlavorProfileListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, FlavorProfilesListBody)
+			fmt.Fprint(w, FlavorProfilesListBody)
 		case "3a0d060b-fcec-4250-9ab6-940b806a12dd":
-			fmt.Fprintf(w, `{ "flavors": [] }`)
+			fmt.Fprint(w, `{ "flavors": [] }`)
 		default:
 			t.Fatalf("/v2.0/lbaas/flavors invoked with unexpected marker=[%s]", marker)
 		}
@@ -117,7 +117,7 @@ func HandleFlavorProfileCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -127,7 +127,7 @@ func HandleFlavorProfileGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleFlavorProfileBody)
+		fmt.Fprint(w, SingleFlavorProfileBody)
 	})
 }
 
@@ -154,6 +154,6 @@ func HandleFlavorProfileUpdateSuccessfully(t *testing.T) {
 			}
 		}`)
 
-		fmt.Fprintf(w, PostUpdateFlavorBody)
+		fmt.Fprint(w, PostUpdateFlavorBody)
 	})
 }
diff --git a/openstack/loadbalancer/v2/flavors/testing/fixtures.go b/openstack/loadbalancer/v2/flavors/testing/fixtures.go
index a3169d7ece..1ec935c156 100644
--- a/openstack/loadbalancer/v2/flavors/testing/fixtures.go
+++ b/openstack/loadbalancer/v2/flavors/testing/fixtures.go
@@ -102,9 +102,9 @@ func HandleFlavorListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, FlavorsListBody)
+			fmt.Fprint(w, FlavorsListBody)
 		case "3a0d060b-fcec-4250-9ab6-940b806a12dd":
-			fmt.Fprintf(w, `{ "flavors": [] }`)
+			fmt.Fprint(w, `{ "flavors": [] }`)
 		default:
 			t.Fatalf("/v2.0/lbaas/flavors invoked with unexpected marker=[%s]", marker)
 		}
@@ -126,7 +126,7 @@ func HandleFlavorCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -136,7 +136,7 @@ func HandleFlavorGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleFlavorBody)
+		fmt.Fprint(w, SingleFlavorBody)
 	})
 }
 
@@ -163,6 +163,6 @@ func HandleFlavorUpdateSuccessfully(t *testing.T) {
 			}
 		}`)
 
-		fmt.Fprintf(w, PostUpdateFlavorBody)
+		fmt.Fprint(w, PostUpdateFlavorBody)
 	})
 }
diff --git a/openstack/loadbalancer/v2/flavors/testing/requests_test.go b/openstack/loadbalancer/v2/flavors/testing/requests_test.go
index fd668a2134..bc73b1271d 100644
--- a/openstack/loadbalancer/v2/flavors/testing/requests_test.go
+++ b/openstack/loadbalancer/v2/flavors/testing/requests_test.go
@@ -69,7 +69,7 @@ func TestListFlavorsEnabled(t *testing.T) {
 				t.Errorf("Expected enabled=%s got %q", testCases[cases], enabled)
 			}
 			cases++
-			fmt.Fprintf(w, `{"flavorprofiles":[]}`)
+			fmt.Fprint(w, `{"flavorprofiles":[]}`)
 		})
 	}()
 
diff --git a/openstack/loadbalancer/v2/l7policies/testing/fixtures_test.go b/openstack/loadbalancer/v2/l7policies/testing/fixtures_test.go
index a1773287f9..56b35cd0e0 100644
--- a/openstack/loadbalancer/v2/l7policies/testing/fixtures_test.go
+++ b/openstack/loadbalancer/v2/l7policies/testing/fixtures_test.go
@@ -131,7 +131,7 @@ func HandleL7PolicyCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -218,9 +218,9 @@ func HandleL7PolicyListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, L7PoliciesListBody)
+			fmt.Fprint(w, L7PoliciesListBody)
 		case "45e08a3e-a78f-4b40-a229-1e7e23eee1ab":
-			fmt.Fprintf(w, `{ "l7policies": [] }`)
+			fmt.Fprint(w, `{ "l7policies": [] }`)
 		default:
 			t.Fatalf("/v2.0/lbaas/l7policies invoked with unexpected marker=[%s]", marker)
 		}
@@ -234,7 +234,7 @@ func HandleL7PolicyGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleL7PolicyBody)
+		fmt.Fprint(w, SingleL7PolicyBody)
 	})
 }
 
@@ -263,7 +263,7 @@ func HandleL7PolicyUpdateSuccessfully(t *testing.T) {
 			}
 		}`)
 
-		fmt.Fprintf(w, PostUpdateL7PolicyBody)
+		fmt.Fprint(w, PostUpdateL7PolicyBody)
 	})
 }
 
@@ -281,7 +281,7 @@ func HandleL7PolicyUpdateNullRedirectURLSuccessfully(t *testing.T) {
 			}
 		}`)
 
-		fmt.Fprintf(w, PostUpdateL7PolicyNullRedirectURLBody)
+		fmt.Fprint(w, PostUpdateL7PolicyNullRedirectURLBody)
 	})
 }
 
@@ -317,7 +317,7 @@ func HandleRuleCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -362,9 +362,9 @@ func HandleRuleListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, RulesListBody)
+			fmt.Fprint(w, RulesListBody)
 		case "45e08a3e-a78f-4b40-a229-1e7e23eee1ab":
-			fmt.Fprintf(w, `{ "rules": [] }`)
+			fmt.Fprint(w, `{ "rules": [] }`)
 		default:
 			t.Fatalf("/v2.0/lbaas/l7policies/8a1412f0-4c32-4257-8b07-af4770b604fd/rules invoked with unexpected marker=[%s]", marker)
 		}
@@ -378,7 +378,7 @@ func HandleRuleGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleRuleBody)
+		fmt.Fprint(w, SingleRuleBody)
 	})
 }
 
@@ -425,6 +425,6 @@ func HandleRuleUpdateSuccessfully(t *testing.T) {
 			}
 		}`)
 
-		fmt.Fprintf(w, PostUpdateRuleBody)
+		fmt.Fprint(w, PostUpdateRuleBody)
 	})
 }
diff --git a/openstack/loadbalancer/v2/listeners/testing/fixtures_test.go b/openstack/loadbalancer/v2/listeners/testing/fixtures_test.go
index edda9b2bac..9f85649411 100644
--- a/openstack/loadbalancer/v2/listeners/testing/fixtures_test.go
+++ b/openstack/loadbalancer/v2/listeners/testing/fixtures_test.go
@@ -218,9 +218,9 @@ func HandleListenerListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, ListenersListBody)
+			fmt.Fprint(w, ListenersListBody)
 		case "45e08a3e-a78f-4b40-a229-1e7e23eee1ab":
-			fmt.Fprintf(w, `{ "listeners": [] }`)
+			fmt.Fprint(w, `{ "listeners": [] }`)
 		default:
 			t.Fatalf("/v2.0/lbaas/listeners invoked with unexpected marker=[%s]", marker)
 		}
@@ -255,7 +255,7 @@ func HandleListenerCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -266,7 +266,7 @@ func HandleListenerGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleListenerBody)
+		fmt.Fprint(w, SingleListenerBody)
 	})
 }
 
@@ -304,7 +304,7 @@ func HandleListenerUpdateSuccessfully(t *testing.T) {
 			}
 		}`)
 
-		fmt.Fprintf(w, PostUpdateListenerBody)
+		fmt.Fprint(w, PostUpdateListenerBody)
 	})
 }
 
@@ -315,6 +315,6 @@ func HandleListenerGetStatsTree(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, GetListenerStatsBody)
+		fmt.Fprint(w, GetListenerStatsBody)
 	})
 }
diff --git a/openstack/loadbalancer/v2/loadbalancers/testing/fixtures_test.go b/openstack/loadbalancer/v2/loadbalancers/testing/fixtures_test.go
index d4f714f7c5..76ef3ec2a7 100644
--- a/openstack/loadbalancer/v2/loadbalancers/testing/fixtures_test.go
+++ b/openstack/loadbalancer/v2/loadbalancers/testing/fixtures_test.go
@@ -453,9 +453,9 @@ func HandleLoadbalancerListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, LoadbalancersListBody)
+			fmt.Fprint(w, LoadbalancersListBody)
 		case "45e08a3e-a78f-4b40-a229-1e7e23eee1ab":
-			fmt.Fprintf(w, `{ "loadbalancers": [] }`)
+			fmt.Fprint(w, `{ "loadbalancers": [] }`)
 		default:
 			t.Fatalf("/v2.0/lbaas/loadbalancers invoked with unexpected marker=[%s]", marker)
 		}
@@ -533,7 +533,7 @@ func HandleFullyPopulatedLoadbalancerCreationSuccessfully(t *testing.T, response
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -559,7 +559,7 @@ func HandleLoadbalancerCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -570,7 +570,7 @@ func HandleLoadbalancerGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleLoadbalancerBody)
+		fmt.Fprint(w, SingleLoadbalancerBody)
 	})
 }
 
@@ -581,7 +581,7 @@ func HandleLoadbalancerGetStatusesTree(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, GetLoadbalancerStatusesBody)
+		fmt.Fprint(w, GetLoadbalancerStatusesBody)
 	})
 }
 
@@ -609,7 +609,7 @@ func HandleLoadbalancerUpdateSuccessfully(t *testing.T) {
 			}
 		}`)
 
-		fmt.Fprintf(w, PostUpdateLoadbalancerBody)
+		fmt.Fprint(w, PostUpdateLoadbalancerBody)
 	})
 }
 
@@ -620,7 +620,7 @@ func HandleLoadbalancerGetStatsTree(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, GetLoadbalancerStatsBody)
+		fmt.Fprint(w, GetLoadbalancerStatsBody)
 	})
 }
 
diff --git a/openstack/loadbalancer/v2/monitors/testing/fixtures_test.go b/openstack/loadbalancer/v2/monitors/testing/fixtures_test.go
index 9526b9cbca..6b12d2c11c 100644
--- a/openstack/loadbalancer/v2/monitors/testing/fixtures_test.go
+++ b/openstack/loadbalancer/v2/monitors/testing/fixtures_test.go
@@ -152,9 +152,9 @@ func HandleHealthmonitorListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, HealthmonitorsListBody)
+			fmt.Fprint(w, HealthmonitorsListBody)
 		case "556c8345-28d8-4f84-a246-e04380b0461d":
-			fmt.Fprintf(w, `{ "healthmonitors": [] }`)
+			fmt.Fprint(w, `{ "healthmonitors": [] }`)
 		default:
 			t.Fatalf("/v2.0/lbaas/healthmonitors invoked with unexpected marker=[%s]", marker)
 		}
@@ -184,7 +184,7 @@ func HandleHealthmonitorCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -195,7 +195,7 @@ func HandleHealthmonitorGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleHealthmonitorBody)
+		fmt.Fprint(w, SingleHealthmonitorBody)
 	})
 }
 
@@ -228,6 +228,6 @@ func HandleHealthmonitorUpdateSuccessfully(t *testing.T) {
 			}
 		}`)
 
-		fmt.Fprintf(w, PostUpdateHealthmonitorBody)
+		fmt.Fprint(w, PostUpdateHealthmonitorBody)
 	})
 }
diff --git a/openstack/loadbalancer/v2/pools/testing/fixtures_test.go b/openstack/loadbalancer/v2/pools/testing/fixtures_test.go
index 47d7c373f8..bcc582a638 100644
--- a/openstack/loadbalancer/v2/pools/testing/fixtures_test.go
+++ b/openstack/loadbalancer/v2/pools/testing/fixtures_test.go
@@ -145,9 +145,9 @@ func HandlePoolListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, PoolsListBody)
+			fmt.Fprint(w, PoolsListBody)
 		case "45e08a3e-a78f-4b40-a229-1e7e23eee1ab":
-			fmt.Fprintf(w, `{ "pools": [] }`)
+			fmt.Fprint(w, `{ "pools": [] }`)
 		default:
 			t.Fatalf("/v2.0/lbaas/pools invoked with unexpected marker=[%s]", marker)
 		}
@@ -172,7 +172,7 @@ func HandlePoolCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -183,7 +183,7 @@ func HandlePoolGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SinglePoolBody)
+		fmt.Fprint(w, SinglePoolBody)
 	})
 }
 
@@ -211,7 +211,7 @@ func HandlePoolUpdateSuccessfully(t *testing.T) {
 			}
 		}`)
 
-		fmt.Fprintf(w, PostUpdatePoolBody)
+		fmt.Fprint(w, PostUpdatePoolBody)
 	})
 }
 
@@ -342,9 +342,9 @@ func HandleMemberListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, MembersListBody)
+			fmt.Fprint(w, MembersListBody)
 		case "45e08a3e-a78f-4b40-a229-1e7e23eee1ab":
-			fmt.Fprintf(w, `{ "members": [] }`)
+			fmt.Fprint(w, `{ "members": [] }`)
 		default:
 			t.Fatalf("/v2.0/lbaas/pools/332abe93-f488-41ba-870b-2ac66be7f853/members invoked with unexpected marker=[%s]", marker)
 		}
@@ -370,7 +370,7 @@ func HandleMemberCreationSuccessfully(t *testing.T, response string) {
 
 		w.WriteHeader(http.StatusAccepted)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, response)
+		fmt.Fprint(w, response)
 	})
 }
 
@@ -381,7 +381,7 @@ func HandleMemberGetSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 
-		fmt.Fprintf(w, SingleMemberBody)
+		fmt.Fprint(w, SingleMemberBody)
 	})
 }
 
@@ -409,7 +409,7 @@ func HandleMemberUpdateSuccessfully(t *testing.T) {
 			}
 		}`)
 
-		fmt.Fprintf(w, PostUpdateMemberBody)
+		fmt.Fprint(w, PostUpdateMemberBody)
 	})
 }
 
diff --git a/openstack/loadbalancer/v2/providers/testing/fixtures_test.go b/openstack/loadbalancer/v2/providers/testing/fixtures_test.go
index 64db9a39bf..b8a857e618 100644
--- a/openstack/loadbalancer/v2/providers/testing/fixtures_test.go
+++ b/openstack/loadbalancer/v2/providers/testing/fixtures_test.go
@@ -50,7 +50,7 @@ func HandleProviderListSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, ProvidersListBody)
+			fmt.Fprint(w, ProvidersListBody)
 		default:
 			t.Fatalf("/v2.0/lbaas/providers invoked with unexpected marker=[%s]", marker)
 		}
diff --git a/openstack/loadbalancer/v2/quotas/testing/requests_test.go b/openstack/loadbalancer/v2/quotas/testing/requests_test.go
index 64c819aecf..6f990428fc 100644
--- a/openstack/loadbalancer/v2/quotas/testing/requests_test.go
+++ b/openstack/loadbalancer/v2/quotas/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestGet_1(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetResponseRaw_1)
+		fmt.Fprint(w, GetResponseRaw_1)
 	})
 
 	q, err := quotas.Get(context.TODO(), fake.ServiceClient(), "0a73845280574ad389c292f6a74afa76").Extract()
@@ -42,7 +42,7 @@ func TestGet_2(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetResponseRaw_2)
+		fmt.Fprint(w, GetResponseRaw_2)
 	})
 
 	q, err := quotas.Get(context.TODO(), fake.ServiceClient(), "0a73845280574ad389c292f6a74afa76").Extract()
@@ -61,7 +61,7 @@ func TestUpdate_1(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, UpdateRequestResponseRaw_1)
+		fmt.Fprint(w, UpdateRequestResponseRaw_1)
 	})
 
 	q, err := quotas.Update(context.TODO(), fake.ServiceClient(), "0a73845280574ad389c292f6a74afa76", quotas.UpdateOpts{
@@ -89,7 +89,7 @@ func TestUpdate_2(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, UpdateRequestResponseRaw_2)
+		fmt.Fprint(w, UpdateRequestResponseRaw_2)
 	})
 
 	q, err := quotas.Update(context.TODO(), fake.ServiceClient(), "0a73845280574ad389c292f6a74afa76", quotas.UpdateOpts{
diff --git a/openstack/messaging/v2/claims/testing/fixtures_test.go b/openstack/messaging/v2/claims/testing/fixtures_test.go
index f713687892..5912ff64e6 100644
--- a/openstack/messaging/v2/claims/testing/fixtures_test.go
+++ b/openstack/messaging/v2/claims/testing/fixtures_test.go
@@ -93,7 +93,7 @@ func HandleCreateSuccessfully(t *testing.T) {
 
 			w.WriteHeader(http.StatusCreated)
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, CreateClaimResponse)
+			fmt.Fprint(w, CreateClaimResponse)
 		})
 }
 
@@ -117,7 +117,7 @@ func HandleGetSuccessfully(t *testing.T) {
 			th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, GetClaimResponse)
+			fmt.Fprint(w, GetClaimResponse)
 		})
 }
 
diff --git a/openstack/messaging/v2/messages/testing/fixtures_test.go b/openstack/messaging/v2/messages/testing/fixtures_test.go
index a5a82db253..95cd47592b 100644
--- a/openstack/messaging/v2/messages/testing/fixtures_test.go
+++ b/openstack/messaging/v2/messages/testing/fixtures_test.go
@@ -229,7 +229,7 @@ func HandleCreateSuccessfully(t *testing.T) {
 
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusCreated)
-			fmt.Fprintf(w, CreateMessageResponse)
+			fmt.Fprint(w, CreateMessageResponse)
 		})
 }
 
@@ -245,7 +245,7 @@ func HandleListSuccessfully(t *testing.T) {
 
 			switch next {
 			case fmt.Sprintf("/v2/queues/%s/messages?limit=1", QueueName):
-				fmt.Fprintf(w, ListMessagesResponse1)
+				fmt.Fprint(w, ListMessagesResponse1)
 			case fmt.Sprintf("/v2/queues/%s/messages?marker=1", QueueName):
 				fmt.Fprint(w, ListMessagesResponse2)
 			case fmt.Sprintf("/v2/queues/%s/messages?marker=2", QueueName):
@@ -262,7 +262,7 @@ func HandleGetMessagesSuccessfully(t *testing.T) {
 			th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, GetMessagesResponse)
+			fmt.Fprint(w, GetMessagesResponse)
 		})
 }
 
@@ -274,7 +274,7 @@ func HandleGetSuccessfully(t *testing.T) {
 			th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, GetMessageResponse)
+			fmt.Fprint(w, GetMessageResponse)
 		})
 }
 
@@ -299,7 +299,7 @@ func HandlePopSuccessfully(t *testing.T) {
 
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			fmt.Fprintf(w, PopMessageResponse)
+			fmt.Fprint(w, PopMessageResponse)
 		})
 }
 
diff --git a/openstack/messaging/v2/queues/testing/fixtures_test.go b/openstack/messaging/v2/queues/testing/fixtures_test.go
index 2e9cf5e752..7abfdc35ba 100644
--- a/openstack/messaging/v2/queues/testing/fixtures_test.go
+++ b/openstack/messaging/v2/queues/testing/fixtures_test.go
@@ -226,7 +226,7 @@ func HandleListSuccessfully(t *testing.T) {
 
 			switch next {
 			case "/v2/queues?limit=1&with_count=true":
-				fmt.Fprintf(w, ListQueuesResponse1)
+				fmt.Fprint(w, ListQueuesResponse1)
 			case "/v2/queues?marker=london":
 				fmt.Fprint(w, ListQueuesResponse2)
 			case "/v2/queues?marker=beijing":
@@ -256,7 +256,7 @@ func HandleUpdateSuccessfully(t *testing.T) {
 			th.TestJSONRequest(t, r, UpdateQueueRequest)
 
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, UpdateQueueResponse)
+			fmt.Fprint(w, UpdateQueueResponse)
 		})
 }
 
@@ -268,7 +268,7 @@ func HandleGetSuccessfully(t *testing.T) {
 			th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, GetQueueResponse)
+			fmt.Fprint(w, GetQueueResponse)
 		})
 }
 
@@ -290,7 +290,7 @@ func HandleGetStatsSuccessfully(t *testing.T) {
 			th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, GetStatsResponse)
+			fmt.Fprint(w, GetStatsResponse)
 		})
 }
 
@@ -303,7 +303,7 @@ func HandleShareSuccessfully(t *testing.T) {
 			th.TestJSONRequest(t, r, CreateShareRequest)
 
 			w.Header().Add("Content-Type", "application/json")
-			fmt.Fprintf(w, CreateShareResponse)
+			fmt.Fprint(w, CreateShareResponse)
 		})
 }
 
diff --git a/openstack/networking/v2/apiversions/testing/requests_test.go b/openstack/networking/v2/apiversions/testing/requests_test.go
index c99c99488b..dbdf61d9fd 100644
--- a/openstack/networking/v2/apiversions/testing/requests_test.go
+++ b/openstack/networking/v2/apiversions/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestListVersions(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "versions": [
         {
@@ -96,7 +96,7 @@ func TestAPIInfo(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "resources": [
         {
diff --git a/openstack/networking/v2/extensions/agents/testing/requests_test.go b/openstack/networking/v2/extensions/agents/testing/requests_test.go
index 070ff1b184..41380edac7 100644
--- a/openstack/networking/v2/extensions/agents/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/agents/testing/requests_test.go
@@ -25,7 +25,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, AgentsListResult)
+		fmt.Fprint(w, AgentsListResult)
 	})
 
 	count := 0
@@ -66,7 +66,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, AgentsGetResult)
+		fmt.Fprint(w, AgentsGetResult)
 	})
 
 	s, err := agents.Get(context.TODO(), fake.ServiceClient(), "43583cf5-472e-4dc8-af5b-6aed4c94ee3a").Extract()
@@ -106,7 +106,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, AgentsUpdateResult)
+		fmt.Fprint(w, AgentsUpdateResult)
 	})
 
 	iTrue := true
@@ -149,7 +149,7 @@ func TestListDHCPNetworks(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, AgentDHCPNetworksListResult)
+		fmt.Fprint(w, AgentDHCPNetworksListResult)
 	})
 
 	s, err := agents.ListDHCPNetworks(context.TODO(), fake.ServiceClient(), "43583cf5-472e-4dc8-af5b-6aed4c94ee3a").Extract()
@@ -223,7 +223,7 @@ func TestListBGPSpeakers(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
 
-			fmt.Fprintf(w, ListBGPSpeakersResult)
+			fmt.Fprint(w, ListBGPSpeakersResult)
 		})
 
 	count := 0
@@ -305,7 +305,7 @@ func TestListDRAgentHostingBGPSpeakers(t *testing.T) {
 
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			fmt.Fprintf(w, ListDRAgentHostingBGPSpeakersResult)
+			fmt.Fprint(w, ListDRAgentHostingBGPSpeakersResult)
 		})
 
 	count := 0
@@ -342,7 +342,7 @@ func TestListL3Routers(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, AgentL3RoutersListResult)
+		fmt.Fprint(w, AgentL3RoutersListResult)
 	})
 
 	s, err := agents.ListL3Routers(context.TODO(), fake.ServiceClient(), "43583cf5-472e-4dc8-af5b-6aed4c94ee3a").Extract()
diff --git a/openstack/networking/v2/extensions/attributestags/testing/requests_test.go b/openstack/networking/v2/extensions/attributestags/testing/requests_test.go
index e9dc3498fb..5f20bdff5f 100644
--- a/openstack/networking/v2/extensions/attributestags/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/attributestags/testing/requests_test.go
@@ -25,7 +25,7 @@ func TestReplaceAll(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, attributestagsReplaceAllResult)
+		fmt.Fprint(w, attributestagsReplaceAllResult)
 	})
 
 	opts := attributestags.ReplaceAllOpts{
@@ -48,7 +48,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, attributestagsListResult)
+		fmt.Fprint(w, attributestagsListResult)
 	})
 
 	res, err := attributestags.List(context.TODO(), fake.ServiceClient(), "networks", "fakeid").Extract()
diff --git a/openstack/networking/v2/extensions/bgp/peers/testing/requests_test.go b/openstack/networking/v2/extensions/bgp/peers/testing/requests_test.go
index 3ec3faa391..f24a0a1a0c 100644
--- a/openstack/networking/v2/extensions/bgp/peers/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/bgp/peers/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestList(t *testing.T) {
 
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			fmt.Fprintf(w, ListBGPPeersResult)
+			fmt.Fprint(w, ListBGPPeersResult)
 		})
 	count := 0
 
@@ -54,7 +54,7 @@ func TestGet(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetBGPPeerResult)
+		fmt.Fprint(w, GetBGPPeerResult)
 	})
 
 	s, err := peers.Get(context.TODO(), fake.ServiceClient(), bgpPeerID).Extract()
@@ -74,7 +74,7 @@ func TestCreate(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 
 	var opts peers.CreateOpts
@@ -124,7 +124,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateBGPPeerResponse)
+		fmt.Fprint(w, UpdateBGPPeerResponse)
 	})
 
 	var opts peers.UpdateOpts
diff --git a/openstack/networking/v2/extensions/bgp/speakers/testing/requests_test.go b/openstack/networking/v2/extensions/bgp/speakers/testing/requests_test.go
index d163086a8a..0ace6b2403 100644
--- a/openstack/networking/v2/extensions/bgp/speakers/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/bgp/speakers/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestList(t *testing.T) {
 
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			fmt.Fprintf(w, ListBGPSpeakerResult)
+			fmt.Fprint(w, ListBGPSpeakerResult)
 		})
 	count := 0
 
@@ -54,7 +54,7 @@ func TestGet(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetBGPSpeakerResult)
+		fmt.Fprint(w, GetBGPSpeakerResult)
 	})
 
 	s, err := speakers.Get(context.TODO(), fake.ServiceClient(), bgpSpeakerID).Extract()
@@ -74,7 +74,7 @@ func TestCreate(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 
 	opts := speakers.CreateOpts{
@@ -124,7 +124,7 @@ func TestUpdate(t *testing.T) {
 			th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			fmt.Fprintf(w, GetBGPSpeakerResult)
+			fmt.Fprint(w, GetBGPSpeakerResult)
 		} else if r.Method == "PUT" {
 			th.TestMethod(t, r, "PUT")
 			th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
@@ -134,7 +134,7 @@ func TestUpdate(t *testing.T) {
 
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			fmt.Fprintf(w, UpdateBGPSpeakerResponse)
+			fmt.Fprint(w, UpdateBGPSpeakerResponse)
 		} else {
 			panic("Unexpected Request")
 		}
@@ -168,7 +168,7 @@ func TestAddBGPPeer(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, AddRemoveBGPPeerJSON)
+		fmt.Fprint(w, AddRemoveBGPPeerJSON)
 	})
 
 	opts := speakers.AddBGPPeerOpts{BGPPeerID: bgpPeerID}
@@ -207,7 +207,7 @@ func TestGetAdvertisedRoutes(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetAdvertisedRoutesResult)
+		fmt.Fprint(w, GetAdvertisedRoutesResult)
 	})
 
 	count := 0
@@ -249,7 +249,7 @@ func TestAddGatewayNetwork(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, AddRemoveGatewayNetworkJSON)
+		fmt.Fprint(w, AddRemoveGatewayNetworkJSON)
 	})
 
 	opts := speakers.AddGatewayNetworkOpts{NetworkID: networkID}
@@ -273,7 +273,7 @@ func TestRemoveGatewayNetwork(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, "")
+		fmt.Fprint(w, "")
 	})
 
 	opts := speakers.RemoveGatewayNetworkOpts{NetworkID: networkID}
diff --git a/openstack/networking/v2/extensions/bgpvpns/testing/requests_test.go b/openstack/networking/v2/extensions/bgpvpns/testing/requests_test.go
index 3b39e7cee0..aacc57aa90 100644
--- a/openstack/networking/v2/extensions/bgpvpns/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/bgpvpns/testing/requests_test.go
@@ -35,7 +35,7 @@ func TestList(t *testing.T) {
 
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			fmt.Fprintf(w, ListBGPVPNsResult)
+			fmt.Fprint(w, ListBGPVPNsResult)
 		})
 	count := 0
 
@@ -67,7 +67,7 @@ func TestGet(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetBGPVPNResult)
+		fmt.Fprint(w, GetBGPVPNResult)
 	})
 
 	r, err := bgpvpns.Get(context.TODO(), fake.ServiceClient(), bgpVpnID).Extract()
@@ -87,7 +87,7 @@ func TestCreate(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 
 	opts := bgpvpns.CreateOpts{
@@ -148,7 +148,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateBGPVPNResponse)
+		fmt.Fprint(w, UpdateBGPVPNResponse)
 	})
 
 	name := "foo"
@@ -186,7 +186,7 @@ func TestListNetworkAssociations(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListNetworkAssociationsResult)
+		fmt.Fprint(w, ListNetworkAssociationsResult)
 	})
 
 	count := 0
@@ -223,7 +223,7 @@ func TestCreateNetworkAssociation(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateNetworkAssociationRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateNetworkAssociationResponse)
+		fmt.Fprint(w, CreateNetworkAssociationResponse)
 	})
 
 	opts := bgpvpns.CreateNetworkAssociationOpts{
@@ -245,7 +245,7 @@ func TestGetNetworkAssociation(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetNetworkAssociationResult)
+		fmt.Fprint(w, GetNetworkAssociationResult)
 	})
 
 	r, err := bgpvpns.GetNetworkAssociation(context.TODO(), fake.ServiceClient(), bgpVpnID, networkAssociationID).Extract()
@@ -289,7 +289,7 @@ func TestListRouterAssociations(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListRouterAssociationsResult)
+		fmt.Fprint(w, ListRouterAssociationsResult)
 	})
 
 	count := 0
@@ -326,7 +326,7 @@ func TestCreateRouterAssociation(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRouterAssociationRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreateRouterAssociationResponse)
+		fmt.Fprint(w, CreateRouterAssociationResponse)
 	})
 
 	opts := bgpvpns.CreateRouterAssociationOpts{
@@ -348,7 +348,7 @@ func TestGetRouterAssociation(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetRouterAssociationResult)
+		fmt.Fprint(w, GetRouterAssociationResult)
 	})
 
 	r, err := bgpvpns.GetRouterAssociation(context.TODO(), fake.ServiceClient(), bgpVpnID, routerAssociationID).Extract()
@@ -370,7 +370,7 @@ func TestUpdateRouterAssociation(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdateRouterAssociationRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdateRouterAssociationResponse)
+		fmt.Fprint(w, UpdateRouterAssociationResponse)
 	})
 
 	opts := bgpvpns.UpdateRouterAssociationOpts{
@@ -417,7 +417,7 @@ func TestListPortAssociations(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListPortAssociationsResult)
+		fmt.Fprint(w, ListPortAssociationsResult)
 	})
 
 	count := 0
@@ -454,7 +454,7 @@ func TestCreatePortAssociation(t *testing.T) {
 		th.TestJSONRequest(t, r, CreatePortAssociationRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, CreatePortAssociationResponse)
+		fmt.Fprint(w, CreatePortAssociationResponse)
 	})
 
 	opts := bgpvpns.CreatePortAssociationOpts{
@@ -476,7 +476,7 @@ func TestGetPortAssociation(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetPortAssociationResult)
+		fmt.Fprint(w, GetPortAssociationResult)
 	})
 
 	r, err := bgpvpns.GetPortAssociation(context.TODO(), fake.ServiceClient(), bgpVpnID, portAssociationID).Extract()
@@ -498,7 +498,7 @@ func TestUpdatePortAssociation(t *testing.T) {
 		th.TestJSONRequest(t, r, UpdatePortAssociationRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, UpdatePortAssociationResponse)
+		fmt.Fprint(w, UpdatePortAssociationResponse)
 	})
 
 	opts := bgpvpns.UpdatePortAssociationOpts{
diff --git a/openstack/networking/v2/extensions/dns/testing/fixtures_test.go b/openstack/networking/v2/extensions/dns/testing/fixtures_test.go
index 340c90083c..85679382de 100644
--- a/openstack/networking/v2/extensions/dns/testing/fixtures_test.go
+++ b/openstack/networking/v2/extensions/dns/testing/fixtures_test.go
@@ -78,7 +78,7 @@ func PortHandleListSuccessfully(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, porttest.ListResponse)
+		fmt.Fprint(w, porttest.ListResponse)
 	})
 }
 
@@ -90,7 +90,7 @@ func PortHandleGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, porttest.GetResponse)
+		fmt.Fprint(w, porttest.GetResponse)
 	})
 }
 
@@ -121,7 +121,7 @@ func PortHandleCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "port": {
         "status": "DOWN",
@@ -184,7 +184,7 @@ func PortHandleUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "port": {
         "status": "DOWN",
@@ -229,7 +229,7 @@ func FloatingIPHandleList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, floatingiptest.ListResponseDNS)
+		fmt.Fprint(w, floatingiptest.ListResponseDNS)
 	})
 }
 
@@ -241,7 +241,7 @@ func FloatingIPHandleGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, fmt.Sprintf(`{"floatingip": %s}`, floatingiptest.FipDNS))
+		fmt.Fprint(w, fmt.Sprintf(`{"floatingip": %s}`, floatingiptest.FipDNS))
 	})
 }
 
@@ -264,7 +264,7 @@ func FloatingIPHandleCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, fmt.Sprintf(`{"floatingip": %s}`, floatingiptest.FipDNS))
+		fmt.Fprint(w, fmt.Sprintf(`{"floatingip": %s}`, floatingiptest.FipDNS))
 	})
 }
 
@@ -278,7 +278,7 @@ func NetworkHandleList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, networktest.ListResponse)
+		fmt.Fprint(w, networktest.ListResponse)
 	})
 }
 
@@ -290,7 +290,7 @@ func NetworkHandleGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, networktest.GetResponse)
+		fmt.Fprint(w, networktest.GetResponse)
 	})
 }
 
@@ -304,7 +304,7 @@ func NetworkHandleCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, NetworkCreateResponse)
+		fmt.Fprint(w, NetworkCreateResponse)
 	})
 }
 
@@ -319,6 +319,6 @@ func NetworkHandleUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, NetworkUpdateResponse)
+		fmt.Fprint(w, NetworkUpdateResponse)
 	})
 }
diff --git a/openstack/networking/v2/extensions/external/testing/results_test.go b/openstack/networking/v2/extensions/external/testing/results_test.go
index 12062e53d8..bf5c02d636 100644
--- a/openstack/networking/v2/extensions/external/testing/results_test.go
+++ b/openstack/networking/v2/extensions/external/testing/results_test.go
@@ -24,7 +24,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, nettest.ListResponse)
+		fmt.Fprint(w, nettest.ListResponse)
 	})
 
 	type NetworkWithExternalExt struct {
@@ -54,7 +54,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, nettest.GetResponse)
+		fmt.Fprint(w, nettest.GetResponse)
 	})
 
 	var s struct {
@@ -83,7 +83,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 
 	iTrue := true
@@ -118,7 +118,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateResponse)
+		fmt.Fprint(w, UpdateResponse)
 	})
 
 	iTrue := true
diff --git a/openstack/networking/v2/extensions/fwaas_v2/groups/testing/requests_test.go b/openstack/networking/v2/extensions/fwaas_v2/groups/testing/requests_test.go
index 59768a756d..540f80aaf4 100644
--- a/openstack/networking/v2/extensions/fwaas_v2/groups/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/fwaas_v2/groups/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "firewall_groups": [
     {
@@ -136,7 +136,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "firewall_group": {
     "id": "6bfb0f10-07f7-4a40-b534-bad4b4ca3428",
@@ -199,7 +199,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "firewall_group": {
     "id": "6bfb0f10-07f7-4a40-b534-bad4b4ca3428",
@@ -260,7 +260,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "firewall_group": {
     "id": "6bfb0f10-07f7-4a40-b534-bad4b4ca3428",
@@ -319,7 +319,7 @@ func TestRemoveIngressPolicy(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "firewall_group": {
     "id": "6bfb0f10-07f7-4a40-b534-bad4b4ca3428",
@@ -367,7 +367,7 @@ func TestRemoveEgressPolicy(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "firewall_group": {
     "id": "6bfb0f10-07f7-4a40-b534-bad4b4ca3428",
diff --git a/openstack/networking/v2/extensions/fwaas_v2/policies/testing/requests_test.go b/openstack/networking/v2/extensions/fwaas_v2/policies/testing/requests_test.go
index 3141f19795..217c062f4c 100644
--- a/openstack/networking/v2/extensions/fwaas_v2/policies/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/fwaas_v2/policies/testing/requests_test.go
@@ -24,7 +24,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "firewall_policies": [
         {
@@ -135,7 +135,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "firewall_policy":{
         "name": "policy",
@@ -189,7 +189,7 @@ func TestInsertRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "audited": false,
     "description": "TESTACC-DESC-8P12aLfW",
@@ -252,7 +252,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "firewall_policy":{
         "name": "www",
@@ -310,7 +310,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "firewall_policy":{
         "name": "policy",
@@ -377,7 +377,7 @@ func TestRemoveRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "audited": false,
     "description": "TESTACC-DESC-skno2e52",
diff --git a/openstack/networking/v2/extensions/fwaas_v2/rules/testing/requests_test.go b/openstack/networking/v2/extensions/fwaas_v2/rules/testing/requests_test.go
index 36469967d8..f251c563c0 100644
--- a/openstack/networking/v2/extensions/fwaas_v2/rules/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/fwaas_v2/rules/testing/requests_test.go
@@ -24,7 +24,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "firewall_rules": [
         {
@@ -150,7 +150,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 	"firewall_rule":{
 		"protocol": "tcp",
@@ -215,7 +215,7 @@ func TestCreateAnyProtocol(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 	"firewall_rule":{
 		"protocol": null,
@@ -264,7 +264,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 	"firewall_rule":{
 		"protocol": "tcp",
@@ -333,7 +333,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 	"firewall_rule":{
 		"protocol": "tcp",
diff --git a/openstack/networking/v2/extensions/layer3/addressscopes/testing/requests_test.go b/openstack/networking/v2/extensions/layer3/addressscopes/testing/requests_test.go
index b59bd3893d..815a0c0f08 100644
--- a/openstack/networking/v2/extensions/layer3/addressscopes/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/layer3/addressscopes/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, AddressScopesListResult)
+		fmt.Fprint(w, AddressScopesListResult)
 	})
 
 	count := 0
@@ -63,7 +63,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, AddressScopesGetResult)
+		fmt.Fprint(w, AddressScopesGetResult)
 	})
 
 	s, err := addressscopes.Get(context.TODO(), fake.ServiceClient(), "9cc35860-522a-4d35-974d-51d4b011801e").Extract()
@@ -91,7 +91,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, AddressScopeCreateResult)
+		fmt.Fprint(w, AddressScopeCreateResult)
 	})
 
 	opts := addressscopes.CreateOpts{
@@ -124,7 +124,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, AddressScopeUpdateResult)
+		fmt.Fprint(w, AddressScopeUpdateResult)
 	})
 
 	shared := true
diff --git a/openstack/networking/v2/extensions/layer3/extraroutes/testing/requests_test.go b/openstack/networking/v2/extensions/layer3/extraroutes/testing/requests_test.go
index 66d08c8898..35d7516e1c 100644
--- a/openstack/networking/v2/extensions/layer3/extraroutes/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/layer3/extraroutes/testing/requests_test.go
@@ -35,7 +35,7 @@ func TestAddExtraRoutes(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "router": {
         "name": "name",
@@ -109,7 +109,7 @@ func TestRemoveExtraRoutes(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "router": {
         "name": "name",
diff --git a/openstack/networking/v2/extensions/layer3/floatingips/testing/requests_test.go b/openstack/networking/v2/extensions/layer3/floatingips/testing/requests_test.go
index 92830dabb4..40f5054b99 100644
--- a/openstack/networking/v2/extensions/layer3/floatingips/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/layer3/floatingips/testing/requests_test.go
@@ -24,7 +24,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 
 	count := 0
@@ -88,7 +88,7 @@ func TestInvalidNextPageURLs(t *testing.T) {
 	th.Mux.HandleFunc("/v2.0/floatingips", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `{"floatingips": [{}], "floatingips_links": {}}`)
+		fmt.Fprint(w, `{"floatingips": [{}], "floatingips_links": {}}`)
 	})
 
 	err := floatingips.List(fake.ServiceClient(), floatingips.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
@@ -134,7 +134,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "floatingip": {
         "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
@@ -189,7 +189,7 @@ func TestCreateEmptyPort(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 				{
 					"floatingip": {
 						"router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
@@ -243,7 +243,7 @@ func TestCreateWithSubnetID(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "floatingip": {
         "router_id": null,
@@ -289,7 +289,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "floatingip": {
         "floating_network_id": "90f742b1-6d17-487b-ba95-71881dbc0b64",
@@ -342,7 +342,7 @@ func TestAssociate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 	"floatingip": {
 			"router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
@@ -384,7 +384,7 @@ func TestDisassociate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "floatingip": {
         "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
diff --git a/openstack/networking/v2/extensions/layer3/portforwarding/testing/requests_test.go b/openstack/networking/v2/extensions/layer3/portforwarding/testing/requests_test.go
index c4ad108146..dc2aa8c49b 100644
--- a/openstack/networking/v2/extensions/layer3/portforwarding/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/layer3/portforwarding/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestPortForwardingList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 
 	count := 0
@@ -91,7 +91,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 	"port_forwarding": {
     		"protocol": "tcp",
@@ -134,7 +134,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "port_forwarding": {
     "protocol": "tcp",
@@ -196,7 +196,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
   "port_forwarding": {
     "protocol": "udp",
diff --git a/openstack/networking/v2/extensions/layer3/routers/testing/requests_test.go b/openstack/networking/v2/extensions/layer3/routers/testing/requests_test.go
index 541dd656b5..6ff1242366 100644
--- a/openstack/networking/v2/extensions/layer3/routers/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/layer3/routers/testing/requests_test.go
@@ -24,7 +24,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "routers": [
         {
@@ -156,7 +156,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "router": {
         "status": "ACTIVE",
@@ -224,7 +224,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "router": {
         "status": "ACTIVE",
@@ -301,7 +301,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "router": {
         "status": "ACTIVE",
@@ -367,7 +367,7 @@ func TestUpdateWithoutRoutes(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "router": {
         "status": "ACTIVE",
@@ -422,7 +422,7 @@ func TestAllRoutesRemoved(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "router": {
         "status": "ACTIVE",
@@ -481,7 +481,7 @@ func TestAddInterface(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "subnet_id": "0d32a837-8069-4ec3-84c4-3eef3e10b188",
     "tenant_id": "017d8de156df4177889f31a9bd6edc00",
@@ -530,7 +530,7 @@ func TestRemoveInterface(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 		"subnet_id": "0d32a837-8069-4ec3-84c4-3eef3e10b188",
 		"tenant_id": "017d8de156df4177889f31a9bd6edc00",
@@ -561,7 +561,7 @@ func TestListL3Agents(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "agents": [
         {
diff --git a/openstack/networking/v2/extensions/mtu/testing/results_test.go b/openstack/networking/v2/extensions/mtu/testing/results_test.go
index 273bdb5166..916bbc00f8 100644
--- a/openstack/networking/v2/extensions/mtu/testing/results_test.go
+++ b/openstack/networking/v2/extensions/mtu/testing/results_test.go
@@ -29,7 +29,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, nettest.ListResponse)
+		fmt.Fprint(w, nettest.ListResponse)
 	})
 
 	type NetworkWithMTUExt struct {
@@ -59,7 +59,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, nettest.GetResponse)
+		fmt.Fprint(w, nettest.GetResponse)
 	})
 
 	var s NetworkMTU
@@ -85,7 +85,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 
 	iTrue := true
@@ -123,7 +123,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateResponse)
+		fmt.Fprint(w, UpdateResponse)
 	})
 
 	iTrue := true
diff --git a/openstack/networking/v2/extensions/networkipavailabilities/testing/requests_test.go b/openstack/networking/v2/extensions/networkipavailabilities/testing/requests_test.go
index 86166b5e33..cdd6d8d4e2 100644
--- a/openstack/networking/v2/extensions/networkipavailabilities/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/networkipavailabilities/testing/requests_test.go
@@ -24,7 +24,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, NetworkIPAvailabilityListResult)
+		fmt.Fprint(w, NetworkIPAvailabilityListResult)
 	})
 
 	count := 0
@@ -65,7 +65,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, NetworkIPAvailabilityGetResult)
+		fmt.Fprint(w, NetworkIPAvailabilityGetResult)
 	})
 
 	s, err := networkipavailabilities.Get(context.TODO(), fake.ServiceClient(), "cf11ab78-2302-49fa-870f-851a08c7afb8").Extract()
diff --git a/openstack/networking/v2/extensions/portsbinding/testing/fixtures_test.go b/openstack/networking/v2/extensions/portsbinding/testing/fixtures_test.go
index 494fe49091..44e2b5db9b 100644
--- a/openstack/networking/v2/extensions/portsbinding/testing/fixtures_test.go
+++ b/openstack/networking/v2/extensions/portsbinding/testing/fixtures_test.go
@@ -18,7 +18,7 @@ func HandleListSuccessfully(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, porttest.ListResponse)
+		fmt.Fprint(w, porttest.ListResponse)
 	})
 }
 
@@ -30,7 +30,7 @@ func HandleGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, porttest.GetResponse)
+		fmt.Fprint(w, porttest.GetResponse)
 	})
 }
 
@@ -62,7 +62,7 @@ func HandleCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "port": {
         "status": "DOWN",
@@ -120,7 +120,7 @@ func HandleUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "port": {
         "status": "DOWN",
diff --git a/openstack/networking/v2/extensions/provider/testing/results_test.go b/openstack/networking/v2/extensions/provider/testing/results_test.go
index 4e21481de1..acbf9f7a1f 100644
--- a/openstack/networking/v2/extensions/provider/testing/results_test.go
+++ b/openstack/networking/v2/extensions/provider/testing/results_test.go
@@ -25,7 +25,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, nettest.ListResponse)
+		fmt.Fprint(w, nettest.ListResponse)
 	})
 
 	type NetworkWithExt struct {
@@ -60,7 +60,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, nettest.GetResponse)
+		fmt.Fprint(w, nettest.GetResponse)
 	})
 
 	var s struct {
@@ -91,7 +91,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, nettest.CreateResponse)
+		fmt.Fprint(w, nettest.CreateResponse)
 	})
 
 	var s struct {
@@ -142,7 +142,7 @@ func TestCreateWithMultipleProvider(t *testing.T) {
 		`)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
 	"network": {
 		"status": "ACTIVE",
@@ -227,7 +227,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, nettest.UpdateResponse)
+		fmt.Fprint(w, nettest.UpdateResponse)
 	})
 
 	var s struct {
diff --git a/openstack/networking/v2/extensions/qos/policies/testing/requests_test.go b/openstack/networking/v2/extensions/qos/policies/testing/requests_test.go
index 72b17e5330..4ad4cf3088 100644
--- a/openstack/networking/v2/extensions/qos/policies/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/qos/policies/testing/requests_test.go
@@ -26,7 +26,7 @@ func TestGetPort(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		_, err := fmt.Fprintf(w, GetPortResponse)
+		_, err := fmt.Fprint(w, GetPortResponse)
 		th.AssertNoErr(t, err)
 	})
 
@@ -55,7 +55,7 @@ func TestCreatePort(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		_, err := fmt.Fprintf(w, CreatePortResponse)
+		_, err := fmt.Fprint(w, CreatePortResponse)
 		th.AssertNoErr(t, err)
 	})
 
@@ -93,7 +93,7 @@ func TestUpdatePortWithPolicy(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		_, err := fmt.Fprintf(w, UpdatePortWithPolicyResponse)
+		_, err := fmt.Fprint(w, UpdatePortWithPolicyResponse)
 		th.AssertNoErr(t, err)
 	})
 
@@ -131,7 +131,7 @@ func TestUpdatePortWithoutPolicy(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		_, err := fmt.Fprintf(w, UpdatePortWithoutPolicyResponse)
+		_, err := fmt.Fprint(w, UpdatePortWithoutPolicyResponse)
 		th.AssertNoErr(t, err)
 	})
 
@@ -166,7 +166,7 @@ func TestGetNetwork(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		_, err := fmt.Fprintf(w, GetNetworkResponse)
+		_, err := fmt.Fprint(w, GetNetworkResponse)
 		th.AssertNoErr(t, err)
 	})
 
@@ -195,7 +195,7 @@ func TestCreateNetwork(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		_, err := fmt.Fprintf(w, CreateNetworkResponse)
+		_, err := fmt.Fprint(w, CreateNetworkResponse)
 		th.AssertNoErr(t, err)
 	})
 
@@ -232,7 +232,7 @@ func TestUpdateNetworkWithPolicy(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		_, err := fmt.Fprintf(w, UpdateNetworkWithPolicyResponse)
+		_, err := fmt.Fprint(w, UpdateNetworkWithPolicyResponse)
 		th.AssertNoErr(t, err)
 	})
 
@@ -273,7 +273,7 @@ func TestUpdateNetworkWithoutPolicy(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		_, err := fmt.Fprintf(w, UpdateNetworkWithoutPolicyResponse)
+		_, err := fmt.Fprint(w, UpdateNetworkWithoutPolicyResponse)
 		th.AssertNoErr(t, err)
 	})
 
@@ -307,7 +307,7 @@ func TestListPolicies(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListPoliciesResponse)
+		fmt.Fprint(w, ListPoliciesResponse)
 	})
 
 	count := 0
@@ -347,7 +347,7 @@ func TestGetPolicy(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetPolicyResponse)
+		fmt.Fprint(w, GetPolicyResponse)
 	})
 
 	p, err := policies.Get(context.TODO(), fake.ServiceClient(), "30a57f4a-336b-4382-8275-d708babd2241").Extract()
@@ -387,7 +387,7 @@ func TestCreatePolicy(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreatePolicyResponse)
+		fmt.Fprint(w, CreatePolicyResponse)
 	})
 
 	opts := policies.CreateOpts{
@@ -425,7 +425,7 @@ func TestUpdatePolicy(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdatePolicyResponse)
+		fmt.Fprint(w, UpdatePolicyResponse)
 	})
 
 	shared := true
diff --git a/openstack/networking/v2/extensions/qos/rules/testing/requests_test.go b/openstack/networking/v2/extensions/qos/rules/testing/requests_test.go
index 4ee49605ea..20de755132 100644
--- a/openstack/networking/v2/extensions/qos/rules/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/qos/rules/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestListBandwidthLimitRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, BandwidthLimitRulesListResult)
+		fmt.Fprint(w, BandwidthLimitRulesListResult)
 	})
 
 	count := 0
@@ -71,7 +71,7 @@ func TestGetBandwidthLimitRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, BandwidthLimitRulesGetResult)
+		fmt.Fprint(w, BandwidthLimitRulesGetResult)
 	})
 
 	r, err := rules.GetBandwidthLimitRule(context.TODO(), fake.ServiceClient(), "501005fa-3b56-4061-aaca-3f24995112e1", "30a57f4a-336b-4382-8275-d708babd2241").ExtractBandwidthLimitRule()
@@ -97,7 +97,7 @@ func TestCreateBandwidthLimitRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, BandwidthLimitRulesCreateResult)
+		fmt.Fprint(w, BandwidthLimitRulesCreateResult)
 	})
 
 	opts := rules.CreateBandwidthLimitRuleOpts{
@@ -125,7 +125,7 @@ func TestUpdateBandwidthLimitRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, BandwidthLimitRulesUpdateResult)
+		fmt.Fprint(w, BandwidthLimitRulesUpdateResult)
 	})
 
 	maxKBps := 500
@@ -166,7 +166,7 @@ func TestListDSCPMarkingRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, DSCPMarkingRulesListResult)
+		fmt.Fprint(w, DSCPMarkingRulesListResult)
 	})
 
 	count := 0
@@ -212,7 +212,7 @@ func TestGetDSCPMarkingRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, DSCPMarkingRuleGetResult)
+		fmt.Fprint(w, DSCPMarkingRuleGetResult)
 	})
 
 	r, err := rules.GetDSCPMarkingRule(context.TODO(), fake.ServiceClient(), "501005fa-3b56-4061-aaca-3f24995112e1", "30a57f4a-336b-4382-8275-d708babd2241").ExtractDSCPMarkingRule()
@@ -236,7 +236,7 @@ func TestCreateDSCPMarkingRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, DSCPMarkingRuleCreateResult)
+		fmt.Fprint(w, DSCPMarkingRuleCreateResult)
 	})
 
 	opts := rules.CreateDSCPMarkingRuleOpts{
@@ -263,7 +263,7 @@ func TestUpdateDSCPMarkingRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, DSCPMarkingRuleUpdateResult)
+		fmt.Fprint(w, DSCPMarkingRuleUpdateResult)
 	})
 
 	dscpMark := 26
@@ -302,7 +302,7 @@ func TestListMinimumBandwidthRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, MinimumBandwidthRulesListResult)
+		fmt.Fprint(w, MinimumBandwidthRulesListResult)
 	})
 
 	count := 0
@@ -349,7 +349,7 @@ func TestGetMinimumBandwidthRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, MinimumBandwidthRulesGetResult)
+		fmt.Fprint(w, MinimumBandwidthRulesGetResult)
 	})
 
 	r, err := rules.GetMinimumBandwidthRule(context.TODO(), fake.ServiceClient(), "501005fa-3b56-4061-aaca-3f24995112e1", "30a57f4a-336b-4382-8275-d708babd2241").ExtractMinimumBandwidthRule()
@@ -374,7 +374,7 @@ func TestCreateMinimumBandwidthRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, MinimumBandwidthRulesCreateResult)
+		fmt.Fprint(w, MinimumBandwidthRulesCreateResult)
 	})
 
 	opts := rules.CreateMinimumBandwidthRuleOpts{
@@ -400,7 +400,7 @@ func TestUpdateMinimumBandwidthRule(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, MinimumBandwidthRulesUpdateResult)
+		fmt.Fprint(w, MinimumBandwidthRulesUpdateResult)
 	})
 
 	minKBps := 500
diff --git a/openstack/networking/v2/extensions/qos/ruletypes/testing/requests_test.go b/openstack/networking/v2/extensions/qos/ruletypes/testing/requests_test.go
index 74eeb49aa4..7bea9f6b66 100644
--- a/openstack/networking/v2/extensions/qos/ruletypes/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/qos/ruletypes/testing/requests_test.go
@@ -52,7 +52,7 @@ func TestGetRuleType(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		_, err := fmt.Fprintf(w, GetRuleTypeResponse)
+		_, err := fmt.Fprint(w, GetRuleTypeResponse)
 		th.AssertNoErr(t, err)
 	})
 
diff --git a/openstack/networking/v2/extensions/quotas/testing/requests_test.go b/openstack/networking/v2/extensions/quotas/testing/requests_test.go
index 7ed3100242..a5714d17fe 100644
--- a/openstack/networking/v2/extensions/quotas/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/quotas/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetResponseRaw)
+		fmt.Fprint(w, GetResponseRaw)
 	})
 
 	q, err := quotas.Get(context.TODO(), fake.ServiceClient(), "0a73845280574ad389c292f6a74afa76").Extract()
@@ -42,7 +42,7 @@ func TestGetDetail(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetDetailedResponseRaw)
+		fmt.Fprint(w, GetDetailedResponseRaw)
 	})
 
 	q, err := quotas.GetDetail(context.TODO(), fake.ServiceClient(), "0a73845280574ad389c292f6a74afa76").Extract()
@@ -61,7 +61,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateRequestResponseRaw)
+		fmt.Fprint(w, UpdateRequestResponseRaw)
 	})
 
 	q, err := quotas.Update(context.TODO(), fake.ServiceClient(), "0a73845280574ad389c292f6a74afa76", quotas.UpdateOpts{
diff --git a/openstack/networking/v2/extensions/rbacpolicies/testing/requests_test.go b/openstack/networking/v2/extensions/rbacpolicies/testing/requests_test.go
index 7503bc7a74..9fc04412f4 100644
--- a/openstack/networking/v2/extensions/rbacpolicies/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/rbacpolicies/testing/requests_test.go
@@ -25,7 +25,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 
 	options := rbacpolicies.CreateOpts{
@@ -51,7 +51,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 
 	n, err := rbacpolicies.Get(context.TODO(), fake.ServiceClient(), "2cf7523a-93b5-4e69-9360-6c6bf986bb7c").Extract()
@@ -70,7 +70,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 
 	client := fake.ServiceClient()
@@ -106,7 +106,7 @@ func TestListWithAllPages(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 
 	client := fake.ServiceClient()
@@ -159,7 +159,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateResponse)
+		fmt.Fprint(w, UpdateResponse)
 	})
 
 	options := rbacpolicies.UpdateOpts{TargetTenant: "9d766060b6354c9e8e2da44cab0e8f38"}
diff --git a/openstack/networking/v2/extensions/security/groups/testing/requests_test.go b/openstack/networking/v2/extensions/security/groups/testing/requests_test.go
index 30c3ab6359..f816f0d6d2 100644
--- a/openstack/networking/v2/extensions/security/groups/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/security/groups/testing/requests_test.go
@@ -24,7 +24,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, SecurityGroupListResponse)
+		fmt.Fprint(w, SecurityGroupListResponse)
 	})
 
 	count := 0
@@ -64,7 +64,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SecurityGroupCreateResponse)
+		fmt.Fprint(w, SecurityGroupCreateResponse)
 	})
 
 	opts := groups.CreateOpts{Name: "new-webservers", Description: "security group for webservers"}
@@ -87,7 +87,7 @@ func TestUpdate(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
 
-			fmt.Fprintf(w, SecurityGroupUpdateResponse)
+			fmt.Fprint(w, SecurityGroupUpdateResponse)
 		})
 
 	opts := groups.UpdateOpts{Name: "newer-webservers"}
@@ -112,7 +112,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, SecurityGroupGetResponse)
+		fmt.Fprint(w, SecurityGroupGetResponse)
 	})
 
 	sg, err := groups.Get(context.TODO(), fake.ServiceClient(), "85cc3048-abc3-43cc-89b3-377341426ac5").Extract()
diff --git a/openstack/networking/v2/extensions/security/rules/testing/requests_test.go b/openstack/networking/v2/extensions/security/rules/testing/requests_test.go
index 40372c298a..843d7eb202 100644
--- a/openstack/networking/v2/extensions/security/rules/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/security/rules/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "security_group_rules": [
         {
@@ -131,7 +131,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "security_group_rule": {
         "description": "test description of rule",
@@ -190,7 +190,7 @@ func TestCreateAnyProtocol(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "security_group_rule": {
         "description": "test description of rule",
@@ -252,7 +252,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "security_group_rule": {
         "direction": "egress",
diff --git a/openstack/networking/v2/extensions/subnetpools/testing/requests_test.go b/openstack/networking/v2/extensions/subnetpools/testing/requests_test.go
index 50f479b9d1..2d8df70180 100644
--- a/openstack/networking/v2/extensions/subnetpools/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/subnetpools/testing/requests_test.go
@@ -24,7 +24,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, SubnetPoolsListResult)
+		fmt.Fprint(w, SubnetPoolsListResult)
 	})
 
 	count := 0
@@ -66,7 +66,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, SubnetPoolGetResult)
+		fmt.Fprint(w, SubnetPoolGetResult)
 	})
 
 	s, err := subnetpools.Get(context.TODO(), fake.ServiceClient(), "0a738452-8057-4ad3-89c2-92f6a74afa76").Extract()
@@ -106,7 +106,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetPoolCreateResult)
+		fmt.Fprint(w, SubnetPoolCreateResult)
 	})
 
 	opts := subnetpools.CreateOpts{
@@ -148,7 +148,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, SubnetPoolUpdateResponse)
+		fmt.Fprint(w, SubnetPoolUpdateResponse)
 	})
 
 	nullString := ""
diff --git a/openstack/networking/v2/extensions/testing/delegate_test.go b/openstack/networking/v2/extensions/testing/delegate_test.go
index eb130cd4b0..9f3421f272 100644
--- a/openstack/networking/v2/extensions/testing/delegate_test.go
+++ b/openstack/networking/v2/extensions/testing/delegate_test.go
@@ -23,7 +23,7 @@ func TestList(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "extensions": [
         {
@@ -83,7 +83,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "extension": {
         "updated": "2013-02-03T10:00:00-00:00",
diff --git a/openstack/networking/v2/extensions/trunks/testing/requests_test.go b/openstack/networking/v2/extensions/trunks/testing/requests_test.go
index bc4a2341ab..81e6bef8c2 100644
--- a/openstack/networking/v2/extensions/trunks/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/trunks/testing/requests_test.go
@@ -25,7 +25,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 
 	iTrue := true
@@ -73,7 +73,7 @@ func TestCreateNoSubports(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateNoSubportsResponse)
+		fmt.Fprint(w, CreateNoSubportsResponse)
 	})
 
 	iTrue := true
@@ -115,7 +115,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 
 	client := fake.ServiceClient()
@@ -153,7 +153,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 
 	n, err := trunks.Get(context.TODO(), fake.ServiceClient(), "f6a9718c-5a64-43e3-944f-4deccad8e78c").Extract()
@@ -177,7 +177,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateResponse)
+		fmt.Fprint(w, UpdateResponse)
 	})
 
 	iFalse := false
@@ -207,7 +207,7 @@ func TestGetSubports(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListSubportsResponse)
+		fmt.Fprint(w, ListSubportsResponse)
 	})
 
 	client := fake.ServiceClient()
@@ -259,7 +259,7 @@ func TestAddSubports(t *testing.T) {
 		th.TestJSONRequest(t, r, AddSubportsRequest)
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, AddSubportsResponse)
+		fmt.Fprint(w, AddSubportsResponse)
 	})
 
 	client := fake.ServiceClient()
@@ -287,7 +287,7 @@ func TestRemoveSubports(t *testing.T) {
 		th.TestJSONRequest(t, r, RemoveSubportsRequest)
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, RemoveSubportsResponse)
+		fmt.Fprint(w, RemoveSubportsResponse)
 	})
 
 	client := fake.ServiceClient()
diff --git a/openstack/networking/v2/extensions/vlantransparent/testing/requests_test.go b/openstack/networking/v2/extensions/vlantransparent/testing/requests_test.go
index d298894de7..dc5d55043a 100644
--- a/openstack/networking/v2/extensions/vlantransparent/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/vlantransparent/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, NetworksVLANTransparentListResult)
+		fmt.Fprint(w, NetworksVLANTransparentListResult)
 	})
 
 	type networkVLANTransparentExt struct {
@@ -59,7 +59,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, NetworksVLANTransparentGetResult)
+		fmt.Fprint(w, NetworksVLANTransparentGetResult)
 	})
 
 	var s struct {
@@ -94,7 +94,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, NetworksVLANTransparentCreateResult)
+		fmt.Fprint(w, NetworksVLANTransparentCreateResult)
 	})
 
 	iTrue := true
@@ -139,7 +139,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, NetworksVLANTransparentUpdateResult)
+		fmt.Fprint(w, NetworksVLANTransparentUpdateResult)
 	})
 
 	iFalse := false
diff --git a/openstack/networking/v2/extensions/vpnaas/endpointgroups/testing/requests_test.go b/openstack/networking/v2/extensions/vpnaas/endpointgroups/testing/requests_test.go
index 806580dd4e..dbf3ba515e 100644
--- a/openstack/networking/v2/extensions/vpnaas/endpointgroups/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/vpnaas/endpointgroups/testing/requests_test.go
@@ -36,7 +36,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "endpoint_group": {
         "description": "",
@@ -90,7 +90,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "endpoint_group": {
         "description": "",
@@ -135,7 +135,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 		{
 	"endpoint_groups": [
 		{
@@ -224,7 +224,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "endpoint_group": {
         "description": "updated description",
diff --git a/openstack/networking/v2/extensions/vpnaas/ikepolicies/testing/requests_test.go b/openstack/networking/v2/extensions/vpnaas/ikepolicies/testing/requests_test.go
index 74b9427cc1..e8e63dfde7 100644
--- a/openstack/networking/v2/extensions/vpnaas/ikepolicies/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/vpnaas/ikepolicies/testing/requests_test.go
@@ -35,7 +35,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "ikepolicy":{
         "name": "policy",
@@ -97,7 +97,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "ikepolicy":{
         "name": "policy",
@@ -165,7 +165,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 		{
 	"ikepolicies": [
 		{
@@ -253,7 +253,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "ikepolicy": {
         "name": "updatedname",
diff --git a/openstack/networking/v2/extensions/vpnaas/ipsecpolicies/testing/requests_test.go b/openstack/networking/v2/extensions/vpnaas/ipsecpolicies/testing/requests_test.go
index 0363c7c63e..35c09a4ad5 100644
--- a/openstack/networking/v2/extensions/vpnaas/ipsecpolicies/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/vpnaas/ipsecpolicies/testing/requests_test.go
@@ -41,7 +41,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "ipsecpolicy": {
         "name": "ipsecpolicy1",
@@ -111,7 +111,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "ipsecpolicy": {
         "name": "ipsecpolicy1",
@@ -180,7 +180,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 		{
 	"ipsecpolicies": [
 		{
@@ -268,7 +268,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 
 	{
 		"ipsecpolicy": {
diff --git a/openstack/networking/v2/extensions/vpnaas/services/testing/requests_test.go b/openstack/networking/v2/extensions/vpnaas/services/testing/requests_test.go
index ce9e50171e..c0a33e8d0f 100644
--- a/openstack/networking/v2/extensions/vpnaas/services/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/vpnaas/services/testing/requests_test.go
@@ -36,7 +36,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "vpnservice": {
         "router_id": "66e3b16c-8ce5-40fb-bb49-ab6d8dc3f2aa",
@@ -91,7 +91,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
    "vpnservices":[
         {
@@ -154,7 +154,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "vpnservice": {
         "router_id": "66e3b16c-8ce5-40fb-bb49-ab6d8dc3f2aa",
@@ -223,7 +223,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "vpnservice": {
         "router_id": "66e3b16c-8ce5-40fb-bb49-ab6d8dc3f2aa",
diff --git a/openstack/networking/v2/extensions/vpnaas/siteconnections/testing/requests_test.go b/openstack/networking/v2/extensions/vpnaas/siteconnections/testing/requests_test.go
index 68977acee4..58279b75d5 100644
--- a/openstack/networking/v2/extensions/vpnaas/siteconnections/testing/requests_test.go
+++ b/openstack/networking/v2/extensions/vpnaas/siteconnections/testing/requests_test.go
@@ -45,7 +45,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "ipsec_site_connection": {
         "status": "PENDING_CREATE",
@@ -150,7 +150,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "ipsec_site_connection": {
         "status": "PENDING_CREATE",
@@ -227,7 +227,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "ipsec_site_connections":[
 	{
@@ -336,7 +336,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 
 	{
     "ipsec_site_connection": {
diff --git a/openstack/networking/v2/networks/testing/requests_test.go b/openstack/networking/v2/networks/testing/requests_test.go
index c28dd2ed0f..f4e905a64f 100644
--- a/openstack/networking/v2/networks/testing/requests_test.go
+++ b/openstack/networking/v2/networks/testing/requests_test.go
@@ -25,7 +25,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 
 	client := fake.ServiceClient()
@@ -62,7 +62,7 @@ func TestListWithExtensions(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 
 	client := fake.ServiceClient()
@@ -101,7 +101,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 
 	n, err := networks.Get(context.TODO(), fake.ServiceClient(), "d32019d3-bc6e-4319-9c1d-6722fc136a22").Extract()
@@ -122,7 +122,7 @@ func TestGetWithExtensions(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 
 	var networkWithExtensions struct {
@@ -150,7 +150,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 
 	iTrue := true
@@ -176,7 +176,7 @@ func TestCreateWithOptionalFields(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateOptionalFieldsRequest)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `{}`)
+		fmt.Fprint(w, `{}`)
 	})
 
 	iTrue := true
@@ -205,7 +205,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateResponse)
+		fmt.Fprint(w, UpdateResponse)
 	})
 
 	iTrue, iFalse := true, false
@@ -237,7 +237,7 @@ func TestUpdateRevision(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateResponse)
+		fmt.Fprint(w, UpdateResponse)
 	})
 
 	th.Mux.HandleFunc("/v2.0/networks/4e8e5957-649f-477b-9e5b-f1f75b21c03d", func(w http.ResponseWriter, r *http.Request) {
@@ -251,7 +251,7 @@ func TestUpdateRevision(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateResponse)
+		fmt.Fprint(w, UpdateResponse)
 	})
 
 	iTrue, iFalse := true, false
@@ -293,7 +293,7 @@ func TestCreatePortSecurity(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreatePortSecurityResponse)
+		fmt.Fprint(w, CreatePortSecurityResponse)
 	})
 
 	var networkWithExtensions struct {
@@ -330,7 +330,7 @@ func TestUpdatePortSecurity(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdatePortSecurityResponse)
+		fmt.Fprint(w, UpdatePortSecurityResponse)
 	})
 
 	var networkWithExtensions struct {
diff --git a/openstack/networking/v2/ports/testing/requests_test.go b/openstack/networking/v2/ports/testing/requests_test.go
index 7c3569b70b..1b77780610 100644
--- a/openstack/networking/v2/ports/testing/requests_test.go
+++ b/openstack/networking/v2/ports/testing/requests_test.go
@@ -27,7 +27,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 
 	count := 0
@@ -86,7 +86,7 @@ func TestListWithExtensions(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ListResponse)
+		fmt.Fprint(w, ListResponse)
 	})
 
 	type portWithExt struct {
@@ -117,7 +117,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 
 	n, err := ports.Get(context.TODO(), fake.ServiceClient(), "46d4bfb9-b26e-41f3-bd2e-e6dcc1ccedb2").Extract()
@@ -152,7 +152,7 @@ func TestGetWithExtensions(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetResponse)
+		fmt.Fprint(w, GetResponse)
 	})
 
 	var portWithExtensions struct {
@@ -181,7 +181,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 
 	asu := true
@@ -231,7 +231,7 @@ func TestCreateOmitSecurityGroups(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateOmitSecurityGroupsResponse)
+		fmt.Fprint(w, CreateOmitSecurityGroupsResponse)
 	})
 
 	asu := true
@@ -280,7 +280,7 @@ func TestCreateWithNoSecurityGroup(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateWithNoSecurityGroupsResponse)
+		fmt.Fprint(w, CreateWithNoSecurityGroupsResponse)
 	})
 
 	asu := true
@@ -329,7 +329,7 @@ func TestCreateWithPropagateUplinkStatus(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreatePropagateUplinkStatusResponse)
+		fmt.Fprint(w, CreatePropagateUplinkStatusResponse)
 	})
 
 	asu := true
@@ -374,7 +374,7 @@ func TestCreateWithValueSpecs(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateValueSpecResponse)
+		fmt.Fprint(w, CreateValueSpecResponse)
 	})
 
 	asu := true
@@ -427,7 +427,7 @@ func TestCreateWithInvalidValueSpecs(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateValueSpecResponse)
+		fmt.Fprint(w, CreateValueSpecResponse)
 	})
 
 	asu := true
@@ -483,7 +483,7 @@ func TestCreatePortSecurity(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreatePortSecurityResponse)
+		fmt.Fprint(w, CreatePortSecurityResponse)
 	})
 
 	var portWithExt struct {
@@ -531,7 +531,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateResponse)
+		fmt.Fprint(w, UpdateResponse)
 	})
 
 	name := "new_port_name"
@@ -573,7 +573,7 @@ func TestUpdateOmitSecurityGroups(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateOmitSecurityGroupsResponse)
+		fmt.Fprint(w, UpdateOmitSecurityGroupsResponse)
 	})
 
 	name := "new_port_name"
@@ -614,7 +614,7 @@ func TestUpdatePropagateUplinkStatus(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdatePropagateUplinkStatusResponse)
+		fmt.Fprint(w, UpdatePropagateUplinkStatusResponse)
 	})
 
 	propagateUplinkStatus := true
@@ -642,7 +642,7 @@ func TestUpdateValueSpecs(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateValueSpecsResponse)
+		fmt.Fprint(w, UpdateValueSpecsResponse)
 	})
 
 	options := ports.UpdateOpts{
@@ -669,7 +669,7 @@ func TestUpdatePortSecurity(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdatePortSecurityResponse)
+		fmt.Fprint(w, UpdatePortSecurityResponse)
 	})
 
 	var portWithExt struct {
@@ -707,7 +707,7 @@ func TestUpdateRevision(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateResponse)
+		fmt.Fprint(w, UpdateResponse)
 	})
 	th.Mux.HandleFunc("/v2.0/ports/65c0ee9f-d634-4522-8954-51021b570b0e", func(w http.ResponseWriter, r *http.Request) {
 		th.TestMethod(t, r, "PUT")
@@ -720,7 +720,7 @@ func TestUpdateRevision(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateResponse)
+		fmt.Fprint(w, UpdateResponse)
 	})
 
 	name := "new_port_name"
@@ -757,7 +757,7 @@ func TestRemoveSecurityGroups(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, RemoveSecurityGroupResponse)
+		fmt.Fprint(w, RemoveSecurityGroupResponse)
 	})
 
 	name := "new_port_name"
@@ -799,7 +799,7 @@ func TestRemoveAllowedAddressPairs(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, RemoveAllowedAddressPairsResponse)
+		fmt.Fprint(w, RemoveAllowedAddressPairsResponse)
 	})
 
 	name := "new_port_name"
@@ -837,7 +837,7 @@ func TestDontUpdateAllowedAddressPairs(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, DontUpdateAllowedAddressPairsResponse)
+		fmt.Fprint(w, DontUpdateAllowedAddressPairsResponse)
 	})
 
 	name := "new_port_name"
@@ -887,7 +887,7 @@ func TestGetWithExtraDHCPOpts(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, GetWithExtraDHCPOptsResponse)
+		fmt.Fprint(w, GetWithExtraDHCPOptsResponse)
 	})
 
 	var s struct {
@@ -933,7 +933,7 @@ func TestCreateWithExtraDHCPOpts(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, CreateWithExtraDHCPOptsResponse)
+		fmt.Fprint(w, CreateWithExtraDHCPOptsResponse)
 	})
 
 	adminStateUp := true
@@ -996,7 +996,7 @@ func TestUpdateWithExtraDHCPOpts(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, UpdateWithExtraDHCPOptsResponse)
+		fmt.Fprint(w, UpdateWithExtraDHCPOptsResponse)
 	})
 
 	name := "updated-port-with-dhcp-opts"
diff --git a/openstack/networking/v2/subnets/testing/requests_test.go b/openstack/networking/v2/subnets/testing/requests_test.go
index 1df6fd1ce3..41ec607cd8 100644
--- a/openstack/networking/v2/subnets/testing/requests_test.go
+++ b/openstack/networking/v2/subnets/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestList(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, SubnetListResult)
+		fmt.Fprint(w, SubnetListResult)
 	})
 
 	count := 0
@@ -65,7 +65,7 @@ func TestGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, SubnetGetResult)
+		fmt.Fprint(w, SubnetGetResult)
 	})
 
 	s, err := subnets.Get(context.TODO(), fake.ServiceClient(), "54d6f61d-db07-451c-9ab3-b9609b6b6f0b").Extract()
@@ -104,7 +104,7 @@ func TestCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetCreateResult)
+		fmt.Fprint(w, SubnetCreateResult)
 	})
 
 	var gatewayIP = "192.168.199.1"
@@ -166,7 +166,7 @@ func TestCreateNoGateway(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetCreateWithNoGatewayResponse)
+		fmt.Fprint(w, SubnetCreateWithNoGatewayResponse)
 	})
 
 	var noGateway = ""
@@ -217,7 +217,7 @@ func TestCreateDefaultGateway(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetCreateWithDefaultGatewayResponse)
+		fmt.Fprint(w, SubnetCreateWithDefaultGatewayResponse)
 	})
 
 	opts := subnets.CreateOpts{
@@ -266,7 +266,7 @@ func TestCreateIPv6RaAddressMode(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetCreateWithIPv6RaAddressModeResponse)
+		fmt.Fprint(w, SubnetCreateWithIPv6RaAddressModeResponse)
 	})
 
 	var gatewayIP = "2001:db8:0:a::1"
@@ -307,7 +307,7 @@ func TestCreateWithNoCIDR(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetCreateResult)
+		fmt.Fprint(w, SubnetCreateResult)
 	})
 
 	opts := subnets.CreateOpts{
@@ -356,7 +356,7 @@ func TestCreateWithPrefixlen(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetCreateResult)
+		fmt.Fprint(w, SubnetCreateResult)
 	})
 
 	opts := subnets.CreateOpts{
@@ -423,7 +423,7 @@ func TestUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetUpdateResponse)
+		fmt.Fprint(w, SubnetUpdateResponse)
 	})
 
 	dnsNameservers := []string{"foo"}
@@ -456,7 +456,7 @@ func TestUpdateGateway(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetUpdateGatewayResponse)
+		fmt.Fprint(w, SubnetUpdateGatewayResponse)
 	})
 
 	var gatewayIP = "10.0.0.1"
@@ -487,7 +487,7 @@ func TestUpdateRemoveGateway(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetUpdateRemoveGatewayResponse)
+		fmt.Fprint(w, SubnetUpdateRemoveGatewayResponse)
 	})
 
 	var noGateway = ""
@@ -518,7 +518,7 @@ func TestUpdateHostRoutes(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetUpdateHostRoutesResponse)
+		fmt.Fprint(w, SubnetUpdateHostRoutesResponse)
 	})
 
 	HostRoutes := []subnets.HostRoute{
@@ -555,7 +555,7 @@ func TestUpdateRemoveHostRoutes(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetUpdateRemoveHostRoutesResponse)
+		fmt.Fprint(w, SubnetUpdateRemoveHostRoutesResponse)
 	})
 
 	noHostRoutes := []subnets.HostRoute{}
@@ -584,7 +584,7 @@ func TestUpdateAllocationPool(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetUpdateAllocationPoolResponse)
+		fmt.Fprint(w, SubnetUpdateAllocationPoolResponse)
 	})
 
 	name := "my_new_subnet"
@@ -625,7 +625,7 @@ func TestUpdateRevision(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetUpdateResponse)
+		fmt.Fprint(w, SubnetUpdateResponse)
 	})
 
 	th.Mux.HandleFunc("/v2.0/subnets/08eae331-0402-425a-923c-34f7cfe39c1c", func(w http.ResponseWriter, r *http.Request) {
@@ -639,7 +639,7 @@ func TestUpdateRevision(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
-		fmt.Fprintf(w, SubnetUpdateResponse)
+		fmt.Fprint(w, SubnetUpdateResponse)
 	})
 
 	dnsNameservers := []string{"foo"}
diff --git a/openstack/objectstorage/v1/containers/testing/fixtures.go b/openstack/objectstorage/v1/containers/testing/fixtures.go
index 0f440472ac..55f4f723b6 100644
--- a/openstack/objectstorage/v1/containers/testing/fixtures.go
+++ b/openstack/objectstorage/v1/containers/testing/fixtures.go
@@ -56,7 +56,7 @@ func HandleListContainerInfoSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, `[
+			fmt.Fprint(w, `[
         {
           "count": 0,
           "bytes": 0,
@@ -69,7 +69,7 @@ func HandleListContainerInfoSuccessfully(t *testing.T) {
         }
       ]`)
 		case "janeausten":
-			fmt.Fprintf(w, `[
+			fmt.Fprint(w, `[
 				{
 					"count": 1,
 					"bytes": 14,
@@ -77,7 +77,7 @@ func HandleListContainerInfoSuccessfully(t *testing.T) {
 				}
 			]`)
 		case "marktwain":
-			fmt.Fprintf(w, `[]`)
+			fmt.Fprint(w, `[]`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -158,7 +158,7 @@ func HandleBulkDeleteSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, bulkDeleteResponse)
+		fmt.Fprint(w, bulkDeleteResponse)
 	})
 }
 
diff --git a/openstack/objectstorage/v1/objects/testing/fixtures_test.go b/openstack/objectstorage/v1/objects/testing/fixtures_test.go
index fd24937f6c..f4546d6ab0 100644
--- a/openstack/objectstorage/v1/objects/testing/fixtures_test.go
+++ b/openstack/objectstorage/v1/objects/testing/fixtures_test.go
@@ -61,7 +61,7 @@ func HandleDownloadObjectSuccessfully(t *testing.T, options ...option) {
 		}
 		w.Header().Set("Last-Modified", date.Format(time.RFC1123))
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, "Successful download with Gophercloud")
+		fmt.Fprint(w, "Successful download with Gophercloud")
 	})
 }
 
@@ -118,7 +118,7 @@ func HandleListObjectsInfoSuccessfully(t *testing.T, options ...option) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, `[
+			fmt.Fprint(w, `[
       {
         "hash": "451e372e48e0f6b1114fa0724aa79fa1",
         "last_modified": "2016-08-17T22:11:58.602650",
@@ -135,7 +135,7 @@ func HandleListObjectsInfoSuccessfully(t *testing.T, options ...option) {
       }
     ]`)
 		case "hello":
-			fmt.Fprintf(w, `[]`)
+			fmt.Fprint(w, `[]`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -157,13 +157,13 @@ func HandleListSubdirSuccessfully(t *testing.T) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, `[
+			fmt.Fprint(w, `[
       {
         "subdir": "directory/"
       }
     ]`)
 		case "directory/":
-			fmt.Fprintf(w, `[]`)
+			fmt.Fprint(w, `[]`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -323,7 +323,7 @@ func HandleBulkDeleteSuccessfully(t *testing.T) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, bulkDeleteResponse)
+		fmt.Fprint(w, bulkDeleteResponse)
 	})
 }
 
diff --git a/openstack/objectstorage/v1/swauth/testing/fixtures_test.go b/openstack/objectstorage/v1/swauth/testing/fixtures_test.go
index b8e0b33f24..01bbfd1a84 100644
--- a/openstack/objectstorage/v1/swauth/testing/fixtures_test.go
+++ b/openstack/objectstorage/v1/swauth/testing/fixtures_test.go
@@ -24,6 +24,6 @@ func HandleAuthSuccessfully(t *testing.T, authOpts swauth.AuthOpts) {
 
 		w.Header().Add("X-Auth-Token", AuthResult.Token)
 		w.Header().Add("X-Storage-Url", AuthResult.StorageURL)
-		fmt.Fprintf(w, "")
+		fmt.Fprint(w, "")
 	})
 }
diff --git a/openstack/orchestration/v1/apiversions/testing/requests_test.go b/openstack/orchestration/v1/apiversions/testing/requests_test.go
index ec4ad6d228..d7149f1cbd 100644
--- a/openstack/orchestration/v1/apiversions/testing/requests_test.go
+++ b/openstack/orchestration/v1/apiversions/testing/requests_test.go
@@ -24,7 +24,7 @@ func TestListVersions(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 {
     "versions": [
         {
diff --git a/openstack/orchestration/v1/buildinfo/testing/fixtures_test.go b/openstack/orchestration/v1/buildinfo/testing/fixtures_test.go
index 72527032d8..74a91e4df3 100644
--- a/openstack/orchestration/v1/buildinfo/testing/fixtures_test.go
+++ b/openstack/orchestration/v1/buildinfo/testing/fixtures_test.go
@@ -41,6 +41,6 @@ func HandleGetSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
diff --git a/openstack/orchestration/v1/stackevents/testing/fixtures_test.go b/openstack/orchestration/v1/stackevents/testing/fixtures_test.go
index 4c22428a9a..a0e31b4ba5 100644
--- a/openstack/orchestration/v1/stackevents/testing/fixtures_test.go
+++ b/openstack/orchestration/v1/stackevents/testing/fixtures_test.go
@@ -128,7 +128,7 @@ func HandleFindSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -250,9 +250,9 @@ func HandleListSuccessfully(t *testing.T, output string) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, output)
+			fmt.Fprint(w, output)
 		case "93940999-7d40-44ae-8de4-19624e7b8d18":
-			fmt.Fprintf(w, `{"events":[]}`)
+			fmt.Fprint(w, `{"events":[]}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -377,9 +377,9 @@ func HandleListResourceEventsSuccessfully(t *testing.T, output string) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, output)
+			fmt.Fprint(w, output)
 		case "93940999-7d40-44ae-8de4-19624e7b8d18":
-			fmt.Fprintf(w, `{"events":[]}`)
+			fmt.Fprint(w, `{"events":[]}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -449,6 +449,6 @@ func HandleGetSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
diff --git a/openstack/orchestration/v1/stackresources/testing/fixtures_test.go b/openstack/orchestration/v1/stackresources/testing/fixtures_test.go
index a306d8de8b..fa1e66575e 100644
--- a/openstack/orchestration/v1/stackresources/testing/fixtures_test.go
+++ b/openstack/orchestration/v1/stackresources/testing/fixtures_test.go
@@ -82,7 +82,7 @@ func HandleFindSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -157,9 +157,9 @@ func HandleListSuccessfully(t *testing.T, output string) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, output)
+			fmt.Fprint(w, output)
 		case "49181cd6-169a-4130-9455-31185bbfc5bf":
-			fmt.Fprintf(w, `{"resources":[]}`)
+			fmt.Fprint(w, `{"resources":[]}`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -227,7 +227,7 @@ func HandleGetSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -256,7 +256,7 @@ func HandleMetadataSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -309,7 +309,7 @@ func HandleListTypesSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -370,7 +370,7 @@ func HandleGetSchemaSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -440,7 +440,7 @@ func HandleGetTemplateSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
diff --git a/openstack/orchestration/v1/stacks/testing/fixtures_test.go b/openstack/orchestration/v1/stacks/testing/fixtures_test.go
index 2244b7d89d..9baed3aced 100644
--- a/openstack/orchestration/v1/stacks/testing/fixtures_test.go
+++ b/openstack/orchestration/v1/stacks/testing/fixtures_test.go
@@ -48,7 +48,7 @@ func HandleCreateSuccessfully(t *testing.T, output string) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -142,9 +142,9 @@ func HandleListSuccessfully(t *testing.T, output string) {
 		marker := r.Form.Get("marker")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, output)
+			fmt.Fprint(w, output)
 		case "db6977b2-27aa-4775-9ae7-6213212d4ada":
-			fmt.Fprintf(w, `[]`)
+			fmt.Fprint(w, `[]`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
@@ -221,7 +221,7 @@ func HandleGetSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -233,7 +233,7 @@ func HandleFindSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -309,7 +309,7 @@ func HandlePreviewSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -432,6 +432,6 @@ func HandleAbandonSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
diff --git a/openstack/orchestration/v1/stacks/utils_test.go b/openstack/orchestration/v1/stacks/utils_test.go
index 07fbb90cba..b7dd86bf0e 100644
--- a/openstack/orchestration/v1/stacks/utils_test.go
+++ b/openstack/orchestration/v1/stacks/utils_test.go
@@ -68,7 +68,7 @@ func TestFetch(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		w.Header().Set("Content-Type", "application/jason")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, "Fee-fi-fo-fum")
+		fmt.Fprint(w, "Fee-fi-fo-fum")
 	})
 
 	client := fakeClient{BaseClient: getHTTPClient()}
diff --git a/openstack/orchestration/v1/stacktemplates/testing/fixtures_test.go b/openstack/orchestration/v1/stacktemplates/testing/fixtures_test.go
index 5b9c9ad345..2e6505702e 100644
--- a/openstack/orchestration/v1/stacktemplates/testing/fixtures_test.go
+++ b/openstack/orchestration/v1/stacktemplates/testing/fixtures_test.go
@@ -48,7 +48,7 @@ func HandleGetSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
 
@@ -91,6 +91,6 @@ func HandleValidateSuccessfully(t *testing.T, output string) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, output)
+		fmt.Fprint(w, output)
 	})
 }
diff --git a/openstack/placement/v1/resourceproviders/testing/fixtures_test.go b/openstack/placement/v1/resourceproviders/testing/fixtures_test.go
index e663cab280..8766d88e27 100644
--- a/openstack/placement/v1/resourceproviders/testing/fixtures_test.go
+++ b/openstack/placement/v1/resourceproviders/testing/fixtures_test.go
@@ -277,7 +277,7 @@ func HandleResourceProviderList(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
 
-			fmt.Fprintf(w, ResourceProvidersBody)
+			fmt.Fprint(w, ResourceProvidersBody)
 		})
 }
 
@@ -289,7 +289,7 @@ func HandleResourceProviderCreate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ResourceProviderCreateBody)
+		fmt.Fprint(w, ResourceProviderCreateBody)
 	})
 }
 
@@ -301,7 +301,7 @@ func HandleResourceProviderGet(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ResourceProviderCreateBody)
+		fmt.Fprint(w, ResourceProviderCreateBody)
 	})
 }
 
@@ -324,7 +324,7 @@ func HandleResourceProviderUpdate(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ResourceProviderUpdateResponse)
+		fmt.Fprint(w, ResourceProviderUpdateResponse)
 	})
 }
 
@@ -339,7 +339,7 @@ func HandleResourceProviderGetUsages(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
 
-			fmt.Fprintf(w, UsagesBody)
+			fmt.Fprint(w, UsagesBody)
 		})
 }
 
@@ -354,7 +354,7 @@ func HandleResourceProviderGetInventories(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
 
-			fmt.Fprintf(w, InventoriesBody)
+			fmt.Fprint(w, InventoriesBody)
 		})
 }
 
@@ -369,7 +369,7 @@ func HandleResourceProviderGetAllocations(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
 
-			fmt.Fprintf(w, AllocationsBody)
+			fmt.Fprint(w, AllocationsBody)
 		})
 }
 
@@ -384,6 +384,6 @@ func HandleResourceProviderGetTraits(t *testing.T) {
 			w.Header().Add("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
 
-			fmt.Fprintf(w, TraitsBody)
+			fmt.Fprint(w, TraitsBody)
 		})
 }
diff --git a/openstack/sharedfilesystems/apiversions/testing/fixtures_test.go b/openstack/sharedfilesystems/apiversions/testing/fixtures_test.go
index 949434480f..37826cab70 100644
--- a/openstack/sharedfilesystems/apiversions/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/apiversions/testing/fixtures_test.go
@@ -186,7 +186,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ManilaAllAPIVersionsResponse)
+		fmt.Fprint(w, ManilaAllAPIVersionsResponse)
 	})
 }
 
@@ -198,7 +198,7 @@ func MockGetResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ManilaAPIVersionResponse)
+		fmt.Fprint(w, ManilaAPIVersionResponse)
 	})
 }
 
@@ -210,7 +210,7 @@ func MockGetNoResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ManilaAPIInvalidVersionResponse_1)
+		fmt.Fprint(w, ManilaAPIInvalidVersionResponse_1)
 	})
 }
 
@@ -222,6 +222,6 @@ func MockGetMultipleResponses(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, ManilaAPIInvalidVersionResponse_2)
+		fmt.Fprint(w, ManilaAPIInvalidVersionResponse_2)
 	})
 }
diff --git a/openstack/sharedfilesystems/v2/availabilityzones/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/availabilityzones/testing/fixtures_test.go
index d6cd25830f..fa18c4cfc9 100644
--- a/openstack/sharedfilesystems/v2/availabilityzones/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/availabilityzones/testing/fixtures_test.go
@@ -17,7 +17,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "availability_zones": [
                 {
diff --git a/openstack/sharedfilesystems/v2/errors/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/errors/testing/fixtures_test.go
index 5a6f7f013c..3adbc89b25 100644
--- a/openstack/sharedfilesystems/v2/errors/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/errors/testing/fixtures_test.go
@@ -37,6 +37,6 @@ func MockCreateResponse(t *testing.T) {
 		th.TestJSONRequest(t, r, createRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusNotFound)
-		fmt.Fprintf(w, createResponse)
+		fmt.Fprint(w, createResponse)
 	})
 }
diff --git a/openstack/sharedfilesystems/v2/messages/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/messages/testing/fixtures_test.go
index 111b6dbf97..123bad35ce 100644
--- a/openstack/sharedfilesystems/v2/messages/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/messages/testing/fixtures_test.go
@@ -25,7 +25,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
           "messages": [
             {
@@ -67,7 +67,7 @@ func MockFilteredListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
           "messages": [
             {
@@ -95,7 +95,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
           "message": {
             "resource_id": "4336d74f-3bdc-4f27-9657-c01ec63680bf",
diff --git a/openstack/sharedfilesystems/v2/replicas/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/replicas/testing/fixtures_test.go
index 00585c9c26..41fa0164c9 100644
--- a/openstack/sharedfilesystems/v2/replicas/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/replicas/testing/fixtures_test.go
@@ -48,7 +48,7 @@ func MockCreateResponse(t *testing.T) {
 		th.TestJSONRequest(t, r, createRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, createResponse)
+		fmt.Fprint(w, createResponse)
 	})
 }
 
@@ -175,7 +175,7 @@ func MockGetResponse(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		th.TestHeader(t, r, "X-OpenStack-Manila-API-Version", "2.11")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, getResponse)
+		fmt.Fprint(w, getResponse)
 	})
 }
 
@@ -330,7 +330,7 @@ func MockListExportLocationsResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		th.TestHeader(t, r, "X-OpenStack-Manila-API-Version", "2.47")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, listExportLocationsResponse)
+		fmt.Fprint(w, listExportLocationsResponse)
 	})
 }
 
@@ -355,6 +355,6 @@ func MockGetExportLocationResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		th.TestHeader(t, r, "X-OpenStack-Manila-API-Version", "2.47")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, getExportLocationResponse)
+		fmt.Fprint(w, getExportLocationResponse)
 	})
 }
diff --git a/openstack/sharedfilesystems/v2/schedulerstats/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/schedulerstats/testing/fixtures_test.go
index 88c4b31203..fdd861d9c8 100644
--- a/openstack/sharedfilesystems/v2/schedulerstats/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/schedulerstats/testing/fixtures_test.go
@@ -274,7 +274,7 @@ func HandlePoolsListSuccessfully(t *testing.T) {
 		if err := r.ParseForm(); err != nil {
 			t.Errorf("Failed to parse request form %v", err)
 		}
-		fmt.Fprintf(w, PoolsListBody)
+		fmt.Fprint(w, PoolsListBody)
 
 	})
 	th.Mux.HandleFunc("/scheduler-stats/pools/detail", func(w http.ResponseWriter, r *http.Request) {
@@ -286,6 +286,6 @@ func HandlePoolsListSuccessfully(t *testing.T) {
 		if err := r.ParseForm(); err != nil {
 			t.Errorf("Failed to parse request form %v", err)
 		}
-		fmt.Fprintf(w, PoolsListBodyDetail)
+		fmt.Fprint(w, PoolsListBodyDetail)
 	})
 }
diff --git a/openstack/sharedfilesystems/v2/securityservices/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/securityservices/testing/fixtures_test.go
index c0b7645770..279fcee4a4 100644
--- a/openstack/sharedfilesystems/v2/securityservices/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/securityservices/testing/fixtures_test.go
@@ -30,7 +30,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "security_service": {
                 "status": "new",
@@ -67,7 +67,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "security_services": [
                 {
@@ -113,7 +113,7 @@ func MockFilteredListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "security_services": [
                 {
@@ -143,7 +143,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "security_service": {
                 "status": "new",
@@ -169,7 +169,7 @@ func MockUpdateResponse(t *testing.T) {
 		th.TestMethod(t, r, "PUT")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
             {
                 "security_service": {
                     "status": "new",
diff --git a/openstack/sharedfilesystems/v2/services/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/services/testing/fixtures_test.go
index 67f7b94c78..9916b033fc 100644
--- a/openstack/sharedfilesystems/v2/services/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/services/testing/fixtures_test.go
@@ -66,6 +66,6 @@ func HandleListSuccessfully(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, ServiceListBody)
+		fmt.Fprint(w, ServiceListBody)
 	})
 }
diff --git a/openstack/sharedfilesystems/v2/shareaccessrules/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/shareaccessrules/testing/fixtures_test.go
index d82014357d..cc63ffac9c 100644
--- a/openstack/sharedfilesystems/v2/shareaccessrules/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/shareaccessrules/testing/fixtures_test.go
@@ -40,7 +40,7 @@ func MockGetResponse(t *testing.T) {
 		th.TestHeader(t, r, "Accept", "application/json")
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, getResponse)
+		fmt.Fprint(w, getResponse)
 	})
 }
 
diff --git a/openstack/sharedfilesystems/v2/shareaccessrules/testing/requests_test.go b/openstack/sharedfilesystems/v2/shareaccessrules/testing/requests_test.go
index 4f86a642d4..7566788e40 100644
--- a/openstack/sharedfilesystems/v2/shareaccessrules/testing/requests_test.go
+++ b/openstack/sharedfilesystems/v2/shareaccessrules/testing/requests_test.go
@@ -49,6 +49,6 @@ func MockListResponse(t *testing.T) {
 		th.TestHeader(t, r, "Accept", "application/json")
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, listResponse)
+		fmt.Fprint(w, listResponse)
 	})
 }
diff --git a/openstack/sharedfilesystems/v2/sharenetworks/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/sharenetworks/testing/fixtures_test.go
index cfa3b1712d..eb608f9b6a 100644
--- a/openstack/sharedfilesystems/v2/sharenetworks/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/sharenetworks/testing/fixtures_test.go
@@ -55,7 +55,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, createResp("my_network",
+		fmt.Fprint(w, createResp("my_network",
 			"This is my share network",
 			"998b42ee-2cee-4d36-8b95-67b5ca1f2109",
 			"53482b62-2c84-4a53-b6ab-30d9d9800d06"))
@@ -85,7 +85,7 @@ func MockListResponse(t *testing.T) {
 
 		switch marker {
 		case "":
-			fmt.Fprintf(w, `{
+			fmt.Fprint(w, `{
             "share_networks": [
                 {
                     "name": "net_my1",
@@ -135,7 +135,7 @@ func MockListResponse(t *testing.T) {
             ]
         }`)
 		default:
-			fmt.Fprintf(w, `
+			fmt.Fprint(w, `
 				{
 					"share_networks": []
 				}`)
@@ -157,7 +157,7 @@ func MockFilteredListResponse(t *testing.T) {
 		marker := r.Form.Get("offset")
 		switch marker {
 		case "":
-			fmt.Fprintf(w, `
+			fmt.Fprint(w, `
 				{
 					"share_networks": [
 						{
@@ -178,7 +178,7 @@ func MockFilteredListResponse(t *testing.T) {
 					]
 				}`)
 		case "1":
-			fmt.Fprintf(w, `
+			fmt.Fprint(w, `
 				{
 					"share_networks": [
 						{
@@ -199,7 +199,7 @@ func MockFilteredListResponse(t *testing.T) {
 					]
 				}`)
 		case "2":
-			fmt.Fprintf(w, `
+			fmt.Fprint(w, `
 				{
 					"share_networks": [
 						{
@@ -220,7 +220,7 @@ func MockFilteredListResponse(t *testing.T) {
 					]
 				}`)
 		default:
-			fmt.Fprintf(w, `
+			fmt.Fprint(w, `
 				{
 					"share_networks": []
 				}`)
@@ -235,7 +235,7 @@ func MockGetResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "share_network": {
                 "name": "net_my1",
@@ -261,7 +261,7 @@ func MockUpdateNeutronResponse(t *testing.T) {
 		th.TestMethod(t, r, "PUT")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
             {
                 "share_network": {
                     "name": "net_my2",
@@ -288,7 +288,7 @@ func MockUpdateNovaResponse(t *testing.T) {
 		th.TestMethod(t, r, "PUT")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
             {
                 "share_network": {
                     "name": "net_my2",
@@ -315,7 +315,7 @@ func MockAddSecurityServiceResponse(t *testing.T) {
 		th.TestMethod(t, r, "POST")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "share_network": {
                 "name": "net2",
@@ -341,7 +341,7 @@ func MockRemoveSecurityServiceResponse(t *testing.T) {
 		th.TestMethod(t, r, "POST")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "share_network": {
                 "name": "net2",
diff --git a/openstack/sharedfilesystems/v2/shares/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/shares/testing/fixtures_test.go
index cfb9e73d2e..36db8b7a22 100644
--- a/openstack/sharedfilesystems/v2/shares/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/shares/testing/fixtures_test.go
@@ -84,7 +84,7 @@ func MockCreateResponse(t *testing.T) {
 		th.TestJSONRequest(t, r, createRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, createResponse)
+		fmt.Fprint(w, createResponse)
 	})
 }
 
@@ -158,7 +158,7 @@ func MockUpdateResponse(t *testing.T) {
 		th.TestJSONRequest(t, r, updateRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, updateResponse)
+		fmt.Fprint(w, updateResponse)
 	})
 }
 
@@ -211,7 +211,7 @@ func MockGetResponse(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, getResponse)
+		fmt.Fprint(w, getResponse)
 	})
 }
 
@@ -304,7 +304,7 @@ func MockListExportLocationsResponse(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, listExportLocationsResponse)
+		fmt.Fprint(w, listExportLocationsResponse)
 	})
 }
 
@@ -325,7 +325,7 @@ func MockGetExportLocationResponse(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, getExportLocationResponse)
+		fmt.Fprint(w, getExportLocationResponse)
 	})
 }
 
@@ -359,7 +359,7 @@ func MockGrantAccessResponse(t *testing.T) {
 		th.TestJSONRequest(t, r, grantAccessRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, grantAccessResponse)
+		fmt.Fprint(w, grantAccessResponse)
 	})
 }
 
@@ -410,7 +410,7 @@ func MockListAccessRightsResponse(t *testing.T) {
 		th.TestJSONRequest(t, r, listAccessRightsRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, listAccessRightsResponse)
+		fmt.Fprint(w, listAccessRightsResponse)
 	})
 }
 
diff --git a/openstack/sharedfilesystems/v2/sharetransfers/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/sharetransfers/testing/fixtures_test.go
index 980292f38f..342c4c5101 100644
--- a/openstack/sharedfilesystems/v2/sharetransfers/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/sharetransfers/testing/fixtures_test.go
@@ -147,7 +147,7 @@ func HandleCreateTransfer(t *testing.T) {
 		th.TestJSONRequest(t, r, CreateRequest)
 
 		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, CreateResponse)
+		fmt.Fprint(w, CreateResponse)
 	})
 }
 
@@ -179,7 +179,7 @@ func HandleListTransfers(t *testing.T) {
 		th.TestFormValues(t, r, map[string]string{"all_tenants": "true"})
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -191,7 +191,7 @@ func HandleListTransfersDetail(t *testing.T) {
 		th.TestFormValues(t, r, map[string]string{"all_tenants": "true"})
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, ListOutput)
+		fmt.Fprint(w, ListOutput)
 	})
 }
 
@@ -202,6 +202,6 @@ func HandleGetTransfer(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, GetOutput)
+		fmt.Fprint(w, GetOutput)
 	})
 }
diff --git a/openstack/sharedfilesystems/v2/sharetypes/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/sharetypes/testing/fixtures_test.go
index 767d42807a..17fb21fa78 100644
--- a/openstack/sharedfilesystems/v2/sharetypes/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/sharetypes/testing/fixtures_test.go
@@ -30,7 +30,7 @@ func MockCreateResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "volume_type": {
                 "os-share-type-access:is_public": true,
@@ -76,7 +76,7 @@ func MockListResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "volume_types": [
                 {
@@ -141,7 +141,7 @@ func MockGetDefaultResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "volume_type": {
                 "required_extra_specs": null,
@@ -172,7 +172,7 @@ func MockGetExtraSpecsResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "extra_specs": {
                 "snapshot_support": "True",
@@ -199,7 +199,7 @@ func MockSetExtraSpecsResponse(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "extra_specs": {
                 "my_key": "my_value"
@@ -223,7 +223,7 @@ func MockShowAccessResponse(t *testing.T) {
 
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
         {
             "share_type_access": [
                 {
diff --git a/openstack/sharedfilesystems/v2/snapshots/testing/fixtures_test.go b/openstack/sharedfilesystems/v2/snapshots/testing/fixtures_test.go
index e34d1081a4..88e94c371a 100644
--- a/openstack/sharedfilesystems/v2/snapshots/testing/fixtures_test.go
+++ b/openstack/sharedfilesystems/v2/snapshots/testing/fixtures_test.go
@@ -59,7 +59,7 @@ func MockCreateResponse(t *testing.T) {
 		th.TestJSONRequest(t, r, createRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, createResponse)
+		fmt.Fprint(w, createResponse)
 	})
 }
 
@@ -114,7 +114,7 @@ func MockUpdateResponse(t *testing.T) {
 		th.TestJSONRequest(t, r, updateRequest)
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, updateResponse)
+		fmt.Fprint(w, updateResponse)
 	})
 }
 
@@ -150,7 +150,7 @@ func MockGetResponse(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, getResponse)
+		fmt.Fprint(w, getResponse)
 	})
 }
 
diff --git a/openstack/testing/client_test.go b/openstack/testing/client_test.go
index 2c158dbfc3..75192a524c 100644
--- a/openstack/testing/client_test.go
+++ b/openstack/testing/client_test.go
@@ -46,7 +46,7 @@ func TestAuthenticatedClientV3(t *testing.T) {
 		w.Header().Add("X-Subject-Token", ID)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `{ "token": { "expires_at": "2013-02-02T18:30:59.000000Z" } }`)
+		fmt.Fprint(w, `{ "token": { "expires_at": "2013-02-02T18:30:59.000000Z" } }`)
 	})
 
 	options := gophercloud.AuthOptions{
@@ -91,7 +91,7 @@ func TestAuthenticatedClientV2(t *testing.T) {
 	})
 
 	th.Mux.HandleFunc("/v2.0/tokens", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 				"access": {
 					"token": {
@@ -197,7 +197,7 @@ func TestIdentityAdminV3Client(t *testing.T) {
 		w.Header().Add("X-Subject-Token", ID)
 
 		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 	{
     "token": {
         "audit_ids": ["VcxU2JYqT8OzfUVvrjEITQ", "qNUTIJntTzO1-XUk5STybw"],
diff --git a/openstack/workflow/v2/crontriggers/testing/requests_test.go b/openstack/workflow/v2/crontriggers/testing/requests_test.go
index fd3bac58e0..8267e2bc79 100644
--- a/openstack/workflow/v2/crontriggers/testing/requests_test.go
+++ b/openstack/workflow/v2/crontriggers/testing/requests_test.go
@@ -25,7 +25,7 @@ func TestCreateCronTrigger(t *testing.T) {
 		w.WriteHeader(http.StatusCreated)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 				"created_at": "2018-09-12 15:48:18",
 				"first_execution_time": "2018-09-12 17:48:00",
@@ -110,7 +110,7 @@ func TestGetCronTrigger(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 				"created_at": "2018-09-12 15:48:18",
 				"first_execution_time": "2018-09-12 17:48:00",
@@ -195,7 +195,7 @@ func TestListCronTriggers(t *testing.T) {
 				"next": "%s/cron_triggers?marker=0520ffd8-f7f1-4f2e-845b-55d953a1cf46"
 			}`, th.Server.URL)
 		case "0520ffd8-f7f1-4f2e-845b-55d953a1cf46":
-			fmt.Fprintf(w, `{ "cron_triggers": [] }`)
+			fmt.Fprint(w, `{ "cron_triggers": [] }`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
diff --git a/openstack/workflow/v2/executions/testing/requests_test.go b/openstack/workflow/v2/executions/testing/requests_test.go
index d0b4641793..86a4700457 100644
--- a/openstack/workflow/v2/executions/testing/requests_test.go
+++ b/openstack/workflow/v2/executions/testing/requests_test.go
@@ -25,7 +25,7 @@ func TestCreateExecution(t *testing.T) {
 		w.WriteHeader(http.StatusCreated)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 				"created_at": "2018-09-12 14:48:49",
 				"description": "description",
@@ -92,7 +92,7 @@ func TestGetExecution(t *testing.T) {
 		th.TestHeader(t, r, "X-Auth-token", fake.TokenID)
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 				"created_at": "2018-09-12 14:48:49",
 				"description": "description",
@@ -189,7 +189,7 @@ func TestListExecutions(t *testing.T) {
 				"next": "%s/executions?marker=50bb59f1-eb77-4017-a77f-6d575b002667"
 			}`, th.Server.URL)
 		case "50bb59f1-eb77-4017-a77f-6d575b002667":
-			fmt.Fprintf(w, `{ "executions": [] }`)
+			fmt.Fprint(w, `{ "executions": [] }`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
diff --git a/openstack/workflow/v2/workflows/testing/requests_test.go b/openstack/workflow/v2/workflows/testing/requests_test.go
index 78f0f78a09..a5d656685f 100644
--- a/openstack/workflow/v2/workflows/testing/requests_test.go
+++ b/openstack/workflow/v2/workflows/testing/requests_test.go
@@ -46,11 +46,11 @@ workflow_echo:
 		w.WriteHeader(http.StatusCreated)
 		w.Header().Add("Content-Type", "application/json")
 
-		fmt.Fprintf(w, `{
+		fmt.Fprint(w, `{
 			"workflows": [
 				{
 					"created_at": "2018-09-12 15:48:17",
-					"definition": "---\nversion: '2.0'\n\nworkflow_echo:\n  description: Simple workflow example\n  type: direct\n\n  input:\n    - msg\n\n  tasks:\n    test:\n      action: std.echo output=\"<%% $.msg %%>\"",
+					"definition": "---\nversion: '2.0'\n\nworkflow_echo:\n  description: Simple workflow example\n  type: direct\n\n  input:\n    - msg\n\n  tasks:\n    test:\n      action: std.echo output=\"<% $.msg %>\"",
 					"id": "604a3a1e-94e3-4066-a34a-aa56873ef236",
 					"input": "msg",
 					"name": "workflow_echo",
@@ -118,10 +118,10 @@ func TestGetWorkflow(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-token", fake.TokenID)
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `
+		fmt.Fprint(w, `
 			{
 				"created_at": "2018-09-12 15:48:17",
-				"definition": "---\nversion: '2.0'\n\nworkflow_echo:\n  description: Simple workflow example\n  type: direct\n\n  input:\n    - msg\n\n  tasks:\n    test:\n      action: std.echo output=\"<%% $.msg %%>\"",
+				"definition": "---\nversion: '2.0'\n\nworkflow_echo:\n  description: Simple workflow example\n  type: direct\n\n  input:\n    - msg\n\n  tasks:\n    test:\n      action: std.echo output=\"<% $.msg %>\"",
 				"id": "604a3a1e-94e3-4066-a34a-aa56873ef236",
 				"input": "msg",
 				"name": "workflow_echo",
@@ -187,7 +187,7 @@ func TestListWorkflows(t *testing.T) {
 				]
 			}`, th.Server.URL)
 		case "604a3a1e-94e3-4066-a34a-aa56873ef236":
-			fmt.Fprintf(w, `{ "workflows": [] }`)
+			fmt.Fprint(w, `{ "workflows": [] }`)
 		default:
 			t.Fatalf("Unexpected marker: [%s]", marker)
 		}
diff --git a/pagination/testing/linked_test.go b/pagination/testing/linked_test.go
index 25166ad861..e28c2b0483 100644
--- a/pagination/testing/linked_test.go
+++ b/pagination/testing/linked_test.go
@@ -45,7 +45,7 @@ func createLinked() pagination.Pager {
 
 	th.Mux.HandleFunc("/page3", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{ "ints": [7, 8, 9], "links": { "next": null } }`)
+		fmt.Fprint(w, `{ "ints": [7, 8, 9], "links": { "next": null } }`)
 	})
 
 	client := createClient()
diff --git a/pagination/testing/marker_test.go b/pagination/testing/marker_test.go
index 45c943e5b7..a41915175d 100644
--- a/pagination/testing/marker_test.go
+++ b/pagination/testing/marker_test.go
@@ -46,11 +46,11 @@ func createMarkerPaged(t *testing.T) pagination.Pager {
 		ms := r.Form["marker"]
 		switch {
 		case len(ms) == 0:
-			fmt.Fprintf(w, "aaa\nbbb\nccc")
+			fmt.Fprint(w, "aaa\nbbb\nccc")
 		case len(ms) == 1 && ms[0] == "ccc":
-			fmt.Fprintf(w, "ddd\neee\nfff")
+			fmt.Fprint(w, "ddd\neee\nfff")
 		case len(ms) == 1 && ms[0] == "fff":
-			fmt.Fprintf(w, "ggg\nhhh\niii")
+			fmt.Fprint(w, "ggg\nhhh\niii")
 		case len(ms) == 1 && ms[0] == "iii":
 			w.WriteHeader(http.StatusNoContent)
 		default:
diff --git a/pagination/testing/single_test.go b/pagination/testing/single_test.go
index 6bcd930cb2..090324a573 100644
--- a/pagination/testing/single_test.go
+++ b/pagination/testing/single_test.go
@@ -38,7 +38,7 @@ func setupSinglePaged() pagination.Pager {
 
 	th.Mux.HandleFunc("/only", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{ "ints": [1, 2, 3] }`)
+		fmt.Fprint(w, `{ "ints": [1, 2, 3] }`)
 	})
 
 	createPage := func(r pagination.PageResult) pagination.Page {
diff --git a/testhelper/fixture/helper.go b/testhelper/fixture/helper.go
index a0f3b5c7b2..7c84378770 100644
--- a/testhelper/fixture/helper.go
+++ b/testhelper/fixture/helper.go
@@ -25,7 +25,7 @@ func SetupHandler(t *testing.T, url, method, requestBody, responseBody string, s
 		w.WriteHeader(status)
 
 		if responseBody != "" {
-			fmt.Fprintf(w, responseBody)
+			fmt.Fprint(w, responseBody)
 		}
 	})
 }
diff --git a/testing/provider_client_test.go b/testing/provider_client_test.go
index 18704fd4b1..44fc37756c 100644
--- a/testing/provider_client_test.go
+++ b/testing/provider_client_test.go
@@ -99,7 +99,7 @@ func TestConcurrentReauth(t *testing.T) {
 		}
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{}`)
+		fmt.Fprint(w, `{}`)
 	})
 
 	wg := new(sync.WaitGroup)
@@ -276,7 +276,7 @@ func TestRequestThatCameDuringReauthWaitsUntilItIsCompleted(t *testing.T) {
 		}
 
 		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprintf(w, `{}`)
+		fmt.Fprint(w, `{}`)
 	})
 
 	wg := new(sync.WaitGroup)

From 752f35e5ad551a3446795aaf68fb99cc134923e9 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Thu, 28 Nov 2024 14:11:35 +0000
Subject: [PATCH 30/32] make: Bump golangci-lint

We also add the '-v' and '--max-same-issues' flags so that we get some
indication that things are running and show more output.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 066946cf8d..2a0618a6b6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 undefine GOFLAGS
 
-GOLANGCI_LINT_VERSION?=v1.57.1
-GO_TEST?=go run gotest.tools/gotestsum@latest --format testname
+GOLANGCI_LINT_VERSION?=v1.62.2
+GO_TEST?=go run gotest.tools/gotestsum@latest --format testname --
 
 ifeq ($(shell command -v podman 2> /dev/null),)
 	RUNNER=docker
@@ -23,7 +23,7 @@ lint:
 		-v ~/.cache/golangci-lint/$(GOLANGCI_LINT_VERSION):/root/.cache \
 		-w /app \
 		-e GOFLAGS="-tags=acceptance" \
-		golangci/golangci-lint:$(GOLANGCI_LINT_VERSION) golangci-lint run
+		golangci/golangci-lint:$(GOLANGCI_LINT_VERSION) golangci-lint run -v --max-same-issues 50
 .PHONY: lint
 
 format:

From 9c474a14d039c14e3ed669672e604608f22cdfe6 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Wed, 17 Jul 2024 11:14:24 +0100
Subject: [PATCH 31/32] tests: Remove service update integration test

Go runs tests in parallel for different packages in parallel. The
service update test was disabling and re-enabling all compute services,
and if this ran at the same time as another test that created a server
then the server creation (and therefore the test) would fail. There does
not appear to be any way to resolve this. We could run all integration
tests serially instead, but this would be a backwards steps that will
massively increase test run time. We could also rewrite the test to only
disable 1 of N nova-compute services, but that would require us to fence
off this compute node in all other tests using non-default parameters to
server create. Given the lack of better options, we simply remove the
test and assume our testing to date on this method has been good enough
and unit tests will be enough to carry us forward.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 .../openstack/compute/v2/services_test.go     | 57 -------------------
 1 file changed, 57 deletions(-)

diff --git a/internal/acceptance/openstack/compute/v2/services_test.go b/internal/acceptance/openstack/compute/v2/services_test.go
index d913173810..7b8d8725b5 100644
--- a/internal/acceptance/openstack/compute/v2/services_test.go
+++ b/internal/acceptance/openstack/compute/v2/services_test.go
@@ -64,60 +64,3 @@ func TestServicesListWithOpts(t *testing.T) {
 
 	th.AssertEquals(t, true, found)
 }
-
-func TestServicesUpdate(t *testing.T) {
-	clients.RequireAdmin(t)
-
-	client, err := clients.NewComputeV2Client()
-	th.AssertNoErr(t, err)
-
-	listOpts := services.ListOpts{
-		Binary: "nova-compute",
-	}
-
-	client.Microversion = "2.53"
-	allPages, err := services.List(client, listOpts).AllPages(context.TODO())
-	th.AssertNoErr(t, err)
-
-	allServices, err := services.ExtractServices(allPages)
-	th.AssertNoErr(t, err)
-
-	// disable all services
-	for _, service := range allServices {
-		opts := services.UpdateOpts{
-			Status: services.ServiceDisabled,
-		}
-		updated, err := services.Update(context.TODO(), client, service.ID, opts).Extract()
-		th.AssertNoErr(t, err)
-
-		th.AssertEquals(t, updated.ID, service.ID)
-	}
-
-	// verify all services are disabled
-	allPages, err = services.List(client, listOpts).AllPages(context.TODO())
-	th.AssertNoErr(t, err)
-
-	allServices, err = services.ExtractServices(allPages)
-	th.AssertNoErr(t, err)
-
-	for _, service := range allServices {
-		th.AssertEquals(t, service.Status, "disabled")
-	}
-
-	// reenable all services
-	allPages, err = services.List(client, listOpts).AllPages(context.TODO())
-	th.AssertNoErr(t, err)
-
-	allServices, err = services.ExtractServices(allPages)
-	th.AssertNoErr(t, err)
-
-	for _, service := range allServices {
-		opts := services.UpdateOpts{
-			Status: services.ServiceEnabled,
-		}
-		updated, err := services.Update(context.TODO(), client, service.ID, opts).Extract()
-		th.AssertNoErr(t, err)
-
-		th.AssertEquals(t, updated.ID, service.ID)
-	}
-}

From 8874ad4a740bdb229e1b5a4ed4f9e49b4c2473ad Mon Sep 17 00:00:00 2001
From: Pierre Prinetti <pierreprinetti@redhat.com>
Date: Fri, 6 Dec 2024 16:33:47 +0100
Subject: [PATCH 32/32] Prepare v2.3.0

---
 CHANGELOG.md       | 8 ++++++++
 provider_client.go | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efe2d9f6af..2520ac743b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v2.3.0 (2024-12-06)
+
+* [GH-3213](https://github.com/gophercloud/gophercloud/pull/3213) [v2] Handle nova api version > 2.87 for hypervisor
+* [GH-3236](https://github.com/gophercloud/gophercloud/pull/3236) [v2] Added required fields for Node API Parity
+* [GH-3248](https://github.com/gophercloud/gophercloud/pull/3248) [v2] Add support for disable_power_off
+* [GH-3261](https://github.com/gophercloud/gophercloud/pull/3261) [v2] Misc cleanups
+* [GH-3262](https://github.com/gophercloud/gophercloud/pull/3262) [v2] Address govet 1.24 issue
+
 ## v2.2.0 (2024-10-18)
 
 * [GH-3176](https://github.com/gophercloud/gophercloud/pull/3176) [v2] [containerinfra]: add "MasterLBEnabled" in Cluster results
diff --git a/provider_client.go b/provider_client.go
index 007266f635..26c925ceff 100644
--- a/provider_client.go
+++ b/provider_client.go
@@ -13,7 +13,7 @@ import (
 
 // DefaultUserAgent is the default User-Agent string set in the request header.
 const (
-	DefaultUserAgent         = "gophercloud/v2.2.0"
+	DefaultUserAgent         = "gophercloud/v2.3.0"
 	DefaultMaxBackoffRetries = 60
 )