diff --git a/db_test.go b/db_test.go
index 679340c4..04908c47 100644
--- a/db_test.go
+++ b/db_test.go
@@ -14,12 +14,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-pg/pg/v10"
+	"github.com/go-pg/pg/v10/orm"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/require"
-
-	"github.com/go-pg/pg/v10"
-	"github.com/go-pg/pg/v10/orm"
 )
 
 func init() {
@@ -34,8 +33,6 @@ func TestGinkgo(t *testing.T) {
 
 func pgOptions() *pg.Options {
 	return &pg.Options{
-		User:      "postgres",
-		Password:  "postgres",
 		TLSConfig: getTLSConfig(),
 
 		MaxRetries:      1,
diff --git a/options.go b/options.go
index df05ebcd..60b1daa8 100644
--- a/options.go
+++ b/options.go
@@ -125,6 +125,10 @@ func (opt *Options) init() {
 		opt.User = env("PGUSER", "postgres")
 	}
 
+	if opt.Password == "" {
+		opt.Password = env("PGPASSWORD", "postgres")
+	}
+
 	if opt.Database == "" {
 		opt.Database = env("PGDATABASE", "postgres")
 	}