diff --git a/Makefile b/Makefile
index 99574ffb..9ffc2aa8 100644
--- a/Makefile
+++ b/Makefile
@@ -71,5 +71,6 @@ docker-push: docker-build
 
 
 e2e-test:
+	kubectl get namespace airflowop-system || kubectl create namespace airflowop-system
 	go test -v -timeout 20m test/e2e/base_test.go --namespace airflowop-system
 	go test -v -timeout 20m test/e2e/cluster_test.go --namespace airflowop-system
diff --git a/templates/postgres-sts.yaml b/templates/postgres-sts.yaml
index e3b4461c..9a64185a 100644
--- a/templates/postgres-sts.yaml
+++ b/templates/postgres-sts.yaml
@@ -39,8 +39,6 @@ spec:
         {{end}}
       containers:
       - name: postgres
-        args:
-        - --explicit-defaults-for-timestamp=ON
         env:
         - name: POSTGRES_DB
           value: testdb
diff --git a/test/e2e/base_test.go b/test/e2e/base_test.go
index 8ea8e268..13c6faac 100644
--- a/test/e2e/base_test.go
+++ b/test/e2e/base_test.go
@@ -83,17 +83,15 @@ var _ = Describe(CRName+" controller tests", func() {
 		ctx.WithTimeout(100).CheckCR(isBaseReady)
 	})
 
-	/*
-		It("creating a "+CRName+" with postgres", func() {
-			ctx = f.NewContext().WithCR(airflowBase(SampleDir + "postgres-celery/base.yaml"))
-			cr := ctx.CR.(*v1alpha1.AirflowBase)
-			By("creating a new " + CRName + ": " + cr.Name)
-			ctx.CreateCR()
-			ctx.WithTimeout(200).CheckStatefulSet(cr.Name+"-postgres", 1, 1)
-			ctx.WithTimeout(10).CheckService(cr.Name+"-sql", map[string]int32{"postgres": 5432})
-			//ctx.WithTimeout(10).CheckSecret(name)
-			ctx.WithTimeout(200).CheckStatefulSet(cr.Name+"-nfs", 1, 1)
-			ctx.WithTimeout(100).CheckCR(isBaseReady)
-		})
-	*/
+	It("creating a "+CRName+" with postgres", func() {
+		ctx = f.NewContext().WithCR(airflowBase(SampleDir + "postgres-celery/base.yaml"))
+		cr := ctx.CR.(*v1alpha1.AirflowBase)
+		By("creating a new " + CRName + ": " + cr.Name)
+		ctx.CreateCR()
+		ctx.WithTimeout(200).CheckStatefulSet(cr.Name+"-postgres", 1, 1)
+		ctx.WithTimeout(10).CheckService(cr.Name+"-sql", map[string]int32{"postgres": 5432})
+		//ctx.WithTimeout(10).CheckSecret(name)
+		ctx.WithTimeout(200).CheckStatefulSet(cr.Name+"-nfs", 1, 1)
+		ctx.WithTimeout(100).CheckCR(isBaseReady)
+	})
 })