diff --git a/src/main/resources/templates/go/readme b/src/main/resources/templates/go/readme
index 101c2d8d6446..c7fe27a3449b 100755
--- a/src/main/resources/templates/go/readme
+++ b/src/main/resources/templates/go/readme
@@ -8,10 +8,10 @@ First, we need to implement two sorting algorithms, in this case `MergeSort` and
 
 **You have the following tasks:**
 
-1. [task][Implement Bubble Sort](artemis/testing/test/structural.TestBubbleSort,artemis/testing/test/behavior.TestBubbleSort)
+1. [task][Implement Bubble Sort](artemis/testing/test/structural.TestBubbleSort,artemis/testing/test/behavior.TestBubbleSortSortsCorrectly)
 Implement the method `PerformSort([]time.Time)` in the class `BubbleSort`. Make sure to follow the Bubble Sort algorithm exactly.
 
-2. [task][Implement Merge Sort](artemis/testing/test/structural.TestMergeSort,artemis/testing/test/behavior.TestMergeSort)
+2. [task][Implement Merge Sort](artemis/testing/test/structural.TestMergeSort,artemis/testing/test/behavior.TestMergeSortSortsCorrectly)
 Implement the method `PerformSort([]time.Time)` in the class `MergeSort`. Make sure to follow the Merge Sort algorithm exactly.
 
 ### Part 2: Strategy Pattern
diff --git a/src/main/resources/templates/go/test/behavior/behavior_test.go b/src/main/resources/templates/go/test/behavior/behavior_test.go
index a521c2b9840b..0af104df30b6 100644
--- a/src/main/resources/templates/go/test/behavior/behavior_test.go
+++ b/src/main/resources/templates/go/test/behavior/behavior_test.go
@@ -23,7 +23,7 @@ type Policy interface {
 	Configure()
 }
 
-func TestBubbleSort(t *testing.T) {
+func TestBubbleSortSortsCorrectly(t *testing.T) {
 	defer handlePanic(t)
 
 	dates, datesWithCorrectOrder := createTestDates()
@@ -37,7 +37,7 @@ func TestBubbleSort(t *testing.T) {
 	}
 }
 
-func TestMergeSort(t *testing.T) {
+func TestMergeSortSortsCorrectly(t *testing.T) {
 	defer handlePanic(t)
 
 	dates, datesWithCorrectOrder := createTestDates()