diff --git a/integrations/timetracking_test.go b/integrations/timetracking_test.go
index e92cb95a896..534bb4d6137 100644
--- a/integrations/timetracking_test.go
+++ b/integrations/timetracking_test.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"path"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -56,6 +57,9 @@ func testViewTimetrackingControls(t *testing.T, session *TestSession, user, repo
 		htmlDoc.AssertElement(t, ".timetrack .stop-cancel .stop", true)
 		htmlDoc.AssertElement(t, ".timetrack .stop-cancel .cancel", true)
 
+		// Sleep for 1 second to not get wrong order for stopping timer
+		time.Sleep(time.Second)
+
 		req = NewRequestWithValues(t, "POST", path.Join(user, repo, "issues", issue, "times", "stopwatch", "toggle"), map[string]string{
 			"_csrf": htmlDoc.GetCSRF(),
 		})
diff --git a/models/fixtures/gpg_key.yml b/models/fixtures/gpg_key.yml
new file mode 100644
index 00000000000..ca780a73aa0
--- /dev/null
+++ b/models/fixtures/gpg_key.yml
@@ -0,0 +1 @@
+[] # empty