diff --git a/.changes/v2.17.0/498-improvements.md b/.changes/v2.17.0/498-improvements.md
new file mode 100644
index 000000000..788cebe3a
--- /dev/null
+++ b/.changes/v2.17.0/498-improvements.md
@@ -0,0 +1 @@
+* Fix Test_NsxtSecurityGroupGetAssociatedVms which had name clash [GH-498]
diff --git a/govcd/nsxt_firewall_group_static_security_group_test.go b/govcd/nsxt_firewall_group_static_security_group_test.go
index 8fa46a3b1..22095b59b 100644
--- a/govcd/nsxt_firewall_group_static_security_group_test.go
+++ b/govcd/nsxt_firewall_group_static_security_group_test.go
@@ -126,7 +126,7 @@ func (vcd *TestVCD) Test_NsxtSecurityGroupGetAssociatedVms(check *C) {
 
 	// VMs are prependend to cleanup list to make sure they are removed before routed network
 	standaloneVm := createStandaloneVm(check, vcd, nsxtVdc, routedNet)
-	PrependToCleanupList(standaloneVm.VM.ID, "standaloneVm", "", check.TestName())
+	PrependToCleanupList(standaloneVm.VM.ID, "standaloneVm", "", standaloneVm.VM.Name)
 
 	secGroupDefinition := &types.NsxtFirewallGroup{
 		Name:           check.TestName(),
@@ -208,10 +208,10 @@ func createNsxtRoutedNetwork(check *C, vcd *TestVCD, vdc *Vdc, edgeGatewayId str
 
 func createStandaloneVm(check *C, vcd *TestVCD, vdc *Vdc, net *OpenApiOrgVdcNetwork) *VM {
 	params := types.CreateVmParams{
-		Name:    check.TestName(),
+		Name:    check.TestName() + "-standalone",
 		PowerOn: false,
 		CreateVm: &types.Vm{
-			Name:                   check.TestName(),
+			Name:                   check.TestName() + "-standalone",
 			VirtualHardwareSection: nil,
 			NetworkConnectionSection: &types.NetworkConnectionSection{
 				Info:                          "Network Configuration for VM",