diff --git a/test/e2e/BUILD.bazel b/test/e2e/BUILD.bazel
index 93205da37..1d86c43df 100644
--- a/test/e2e/BUILD.bazel
+++ b/test/e2e/BUILD.bazel
@@ -20,6 +20,7 @@ go_library(
     deps = [
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/addon:go_default_library",
+        "//test/e2e/framework/log:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
     ],
 )
diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
index 5c3b1c2e6..b6e03702c 100644
--- a/test/e2e/e2e.go
+++ b/test/e2e/e2e.go
@@ -17,7 +17,6 @@ limitations under the License.
 package e2e
 
 import (
-	"fmt"
 	"io/ioutil"
 	"os"
 	"path"
@@ -26,6 +25,7 @@ import (
 
 	"github.com/jetstack/cert-manager/test/e2e/framework"
 	"github.com/jetstack/cert-manager/test/e2e/framework/addon"
+	"github.com/jetstack/cert-manager/test/e2e/framework/log"
 )
 
 var (
@@ -62,7 +62,7 @@ var _ = ginkgo.SynchronizedAfterSuite(func() {},
 		var err error
 		globalLogs, err = addon.GlobalLogs()
 		if err != nil {
-			ginkgo.GinkgoWriter.Write([]byte("Failed to retrieve global addon logs: " + err.Error()))
+			log.Logf("Failed to retrieve global addon logs: " + err.Error())
 		}
 
 		for k, v := range globalLogs {
@@ -70,13 +70,13 @@ var _ = ginkgo.SynchronizedAfterSuite(func() {},
 			// Create a directory for the file if needed
 			err := os.MkdirAll(path.Dir(outPath), 0755)
 			if err != nil {
-				ginkgo.GinkgoWriter.Write([]byte(fmt.Sprintf("Failed to create directory for logs: %v", err)))
+				log.Logf("Failed to create directory for logs: %v", err)
 				continue
 			}
 
 			err = ioutil.WriteFile(outPath, []byte(v), 0644)
 			if err != nil {
-				ginkgo.GinkgoWriter.Write([]byte(fmt.Sprintf("Failed to write log file: %v", err)))
+				log.Logf("Failed to write log file: %v", err)
 				continue
 			}
 		}
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index 4bc266ae0..a67dda8c1 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -17,7 +17,6 @@ limitations under the License.
 package framework
 
 import (
-	"fmt"
 	"time"
 
 	. "github.com/onsi/ginkgo"
@@ -36,6 +35,7 @@ import (
 	"github.com/jetstack/cert-manager/test/e2e/framework/addon"
 	"github.com/jetstack/cert-manager/test/e2e/framework/config"
 	"github.com/jetstack/cert-manager/test/e2e/framework/helper"
+	"github.com/jetstack/cert-manager/test/e2e/framework/log"
 	"github.com/jetstack/cert-manager/test/e2e/framework/util"
 	"github.com/jetstack/cert-manager/test/e2e/framework/util/errors"
 )
@@ -144,7 +144,8 @@ func (f *Framework) printAddonLogs() {
 				l, err := a.Logs()
 				Expect(err).NotTo(HaveOccurred())
 
-				GinkgoWriter.Write([]byte(fmt.Sprintf("Got pod logs for addon: \n%s", l)))
+				// TODO: replace with writing logs to a file
+				log.Logf("Got pod logs for addon: \n%s", l)
 			}
 		}
 	}