diff --git a/doc.go b/doc.go
index 51c3a2a8..bf412bda 100644
--- a/doc.go
+++ b/doc.go
@@ -8,7 +8,7 @@ Package xorm is a simple and powerful ORM for Go.
 
 Installation
 
-Make sure you have installed Go 1.5+ and then:
+Make sure you have installed Go 1.6+ and then:
 
     go get github.com/go-xorm/xorm
 
diff --git a/engine.go b/engine.go
index 5cc8da95..b2b2f97b 100644
--- a/engine.go
+++ b/engine.go
@@ -195,11 +195,6 @@ func (engine *Engine) SetMaxIdleConns(conns int) {
 	engine.db.SetMaxIdleConns(conns)
 }
 
-// SetConnMaxLifetime sets the maximum amount of time a connection may be reused.
-func (engine *Engine) SetConnMaxLifetime(d time.Duration) {
-	engine.db.SetConnMaxLifetime(d)
-}
-
 // SetDefaultCacher set the default cacher. Xorm's default not enable cacher.
 func (engine *Engine) SetDefaultCacher(cacher core.Cacher) {
 	engine.Cacher = cacher
diff --git a/engine_maxlife.go b/engine_maxlife.go
new file mode 100644
index 00000000..21daeaa1
--- /dev/null
+++ b/engine_maxlife.go
@@ -0,0 +1,14 @@
+// Copyright 2017 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.6
+
+package xorm
+
+import "time"
+
+// SetConnMaxLifetime sets the maximum amount of time a connection may be reused.
+func (engine *Engine) SetConnMaxLifetime(d time.Duration) {
+	engine.db.SetConnMaxLifetime(d)
+}
diff --git a/engine_test.go b/engine_test.go
deleted file mode 100644
index fcd3953c..00000000
--- a/engine_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2017 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xorm
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAutoIncrTag(t *testing.T) {
-	assert.NoError(t, prepareEngine())
-
-	type TestAutoIncr1 struct {
-		Id int64
-	}
-
-	tb := testEngine.TableInfo(new(TestAutoIncr1))
-	cols := tb.Columns()
-	assert.EqualValues(t, 1, len(cols))
-	assert.True(t, cols[0].IsAutoIncrement)
-	assert.True(t, cols[0].IsPrimaryKey)
-	assert.Equal(t, "id", cols[0].Name)
-
-	type TestAutoIncr2 struct {
-		Id int64 `xorm:"id"`
-	}
-
-	tb = testEngine.TableInfo(new(TestAutoIncr2))
-	cols = tb.Columns()
-	assert.EqualValues(t, 1, len(cols))
-	assert.False(t, cols[0].IsAutoIncrement)
-	assert.False(t, cols[0].IsPrimaryKey)
-	assert.Equal(t, "id", cols[0].Name)
-
-	type TestAutoIncr3 struct {
-		Id int64 `xorm:"'ID'"`
-	}
-
-	tb = testEngine.TableInfo(new(TestAutoIncr3))
-	cols = tb.Columns()
-	assert.EqualValues(t, 1, len(cols))
-	assert.False(t, cols[0].IsAutoIncrement)
-	assert.False(t, cols[0].IsPrimaryKey)
-	assert.Equal(t, "ID", cols[0].Name)
-
-	type TestAutoIncr4 struct {
-		Id int64 `xorm:"pk"`
-	}
-
-	tb = testEngine.TableInfo(new(TestAutoIncr4))
-	cols = tb.Columns()
-	assert.EqualValues(t, 1, len(cols))
-	assert.False(t, cols[0].IsAutoIncrement)
-	assert.True(t, cols[0].IsPrimaryKey)
-	assert.Equal(t, "id", cols[0].Name)
-}
diff --git a/helpers_test.go b/helpers_test.go
index 7d17383d..d57c54ae 100644
--- a/helpers_test.go
+++ b/helpers_test.go
@@ -1,3 +1,7 @@
+// Copyright 2017 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package xorm
 
 import "testing"
diff --git a/tag_test.go b/tag_test.go
index 4201b1c5..fd32f13c 100644
--- a/tag_test.go
+++ b/tag_test.go
@@ -187,3 +187,51 @@ func TestLowerCase(t *testing.T) {
 		panic(err)
 	}
 }
+
+func TestAutoIncrTag(t *testing.T) {
+	assert.NoError(t, prepareEngine())
+
+	type TestAutoIncr1 struct {
+		Id int64
+	}
+
+	tb := testEngine.TableInfo(new(TestAutoIncr1))
+	cols := tb.Columns()
+	assert.EqualValues(t, 1, len(cols))
+	assert.True(t, cols[0].IsAutoIncrement)
+	assert.True(t, cols[0].IsPrimaryKey)
+	assert.Equal(t, "id", cols[0].Name)
+
+	type TestAutoIncr2 struct {
+		Id int64 `xorm:"id"`
+	}
+
+	tb = testEngine.TableInfo(new(TestAutoIncr2))
+	cols = tb.Columns()
+	assert.EqualValues(t, 1, len(cols))
+	assert.False(t, cols[0].IsAutoIncrement)
+	assert.False(t, cols[0].IsPrimaryKey)
+	assert.Equal(t, "id", cols[0].Name)
+
+	type TestAutoIncr3 struct {
+		Id int64 `xorm:"'ID'"`
+	}
+
+	tb = testEngine.TableInfo(new(TestAutoIncr3))
+	cols = tb.Columns()
+	assert.EqualValues(t, 1, len(cols))
+	assert.False(t, cols[0].IsAutoIncrement)
+	assert.False(t, cols[0].IsPrimaryKey)
+	assert.Equal(t, "ID", cols[0].Name)
+
+	type TestAutoIncr4 struct {
+		Id int64 `xorm:"pk"`
+	}
+
+	tb = testEngine.TableInfo(new(TestAutoIncr4))
+	cols = tb.Columns()
+	assert.EqualValues(t, 1, len(cols))
+	assert.False(t, cols[0].IsAutoIncrement)
+	assert.True(t, cols[0].IsPrimaryKey)
+	assert.Equal(t, "id", cols[0].Name)
+}
\ No newline at end of file