diff --git a/dialect_common.go b/dialect_common.go
index 64d720db2..1e5e3b615 100644
--- a/dialect_common.go
+++ b/dialect_common.go
@@ -39,13 +39,10 @@ func (commonDialect) Quote(key string) string {
 }
 
 func (s *commonDialect) fieldCanAutoIncrement(field *StructField) bool {
-	// add a new tag "NOT_AUTO_INCREMENT"
-	_, not := field.TagSettings["NOT_AUTO_INCREMENT"]
-	if not {
-		return false
+	if value, ok := field.TagSettings["AUTO_INCREMENT"]; ok {
+		return value != "FALSE"
 	}
-	_, ok := field.TagSettings["AUTO_INCREMENT"]
-	return ok || field.IsPrimaryKey
+	return field.IsPrimaryKey
 }
 
 func (s *commonDialect) DataTypeOf(field *StructField) string {
diff --git a/main_test.go b/main_test.go
index 34f96a86f..499324bc6 100644
--- a/main_test.go
+++ b/main_test.go
@@ -72,8 +72,10 @@ func OpenTestConnection() (db *gorm.DB, err error) {
 
 	// db.SetLogger(Logger{log.New(os.Stdout, "\r\n", 0)})
 	// db.SetLogger(log.New(os.Stdout, "\r\n", 0))
-	if os.Getenv("DEBUG") == "true" {
+	if debug := os.Getenv("DEBUG"); debug == "true" {
 		db.LogMode(true)
+	} else if debug == "false" {
+		db.LogMode(false)
 	}
 
 	db.DB().SetMaxIdleConns(10)
diff --git a/test_all.sh b/test_all.sh
index 80b319bf0..5cfb3321a 100755
--- a/test_all.sh
+++ b/test_all.sh
@@ -1,5 +1,5 @@
 dialects=("postgres" "mysql" "mssql" "sqlite")
 
 for dialect in "${dialects[@]}" ; do
-    GORM_DIALECT=${dialect} go test
+    DEBUG=false GORM_DIALECT=${dialect} go test
 done