diff --git a/context.go b/context.go
index 56275589..d9e66f36 100644
--- a/context.go
+++ b/context.go
@@ -25,6 +25,12 @@ type (
 	Context interface {
 		context.Context
 
+		// Context returns `context.Context`.
+		Context() context.Context
+
+		// SetContext sets `context.Context`.
+		SetContext(context.Context)
+
 		// Request returns `engine.Request` interface.
 		Request() engine.Request
 
diff --git a/context_test.go b/context_test.go
index 08c85b49..9c23759c 100644
--- a/context_test.go
+++ b/context_test.go
@@ -328,7 +328,8 @@ func TestContextRedirect(t *testing.T) {
 }
 
 func TestContextEmbedded(t *testing.T) {
-	c := new(echoContext)
+	var c Context
+	c = new(echoContext)
 	c.SetContext(context.WithValue(c, "key", "val"))
 	assert.Equal(t, "val", c.Value("key"))
 	now := time.Now()
@@ -341,7 +342,8 @@ func TestContextEmbedded(t *testing.T) {
 }
 
 func TestContextStore(t *testing.T) {
-	c := new(echoContext)
+	var c Context
+	c = new(echoContext)
 	c.Set("name", "Jon Snow")
 	assert.Equal(t, "Jon Snow", c.Get("name"))
 }