diff --git a/main.go b/main.go
index 6bfd4db..f27289a 100644
--- a/main.go
+++ b/main.go
@@ -31,7 +31,8 @@ func main() {
 		fmt.Printf("Could not set up logging: %s\n", err)
 		os.Exit(1)
 	}
-	defer logger.Sync()
+	// Make sure to flush the zap logger buffer before exiting
+	defer logger.Sync() //nolint:all
 	sugar := logger.Sugar()
 
 	sugar.Infow("Using config file",
diff --git a/pkg/acmedns/util_test.go b/pkg/acmedns/util_test.go
index 485a49c..f859309 100644
--- a/pkg/acmedns/util_test.go
+++ b/pkg/acmedns/util_test.go
@@ -3,7 +3,6 @@ package acmedns
 import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"io/ioutil"
 	"os"
 	"syscall"
 	"testing"
@@ -111,7 +110,7 @@ func TestReadConfig(t *testing.T) {
 }
 
 func TestFileCheckPermissionDenied(t *testing.T) {
-	tmpfile, err := ioutil.TempFile("", "acmedns")
+	tmpfile, err := os.CreateTemp("", "acmedns")
 	if err != nil {
 		t.Error("Could not create temporary file")
 	}
@@ -130,7 +129,7 @@ func TestFileCheckNotExists(t *testing.T) {
 }
 
 func TestFileCheckOK(t *testing.T) {
-	tmpfile, err := ioutil.TempFile("", "acmedns")
+	tmpfile, err := os.CreateTemp("", "acmedns")
 	if err != nil {
 		t.Error("Could not create temporary file")
 	}
diff --git a/pkg/nameserver/dns_test.go b/pkg/nameserver/dns_test.go
index de8eaa5..726a25a 100644
--- a/pkg/nameserver/dns_test.go
+++ b/pkg/nameserver/dns_test.go
@@ -28,10 +28,7 @@ var records = []string{
 }
 
 func loggerHasEntryWithMessage(message string, logObserver *observer.ObservedLogs) bool {
-	if len(logObserver.FilterMessage(message).All()) > 0 {
-		return true
-	}
-	return false
+	return len(logObserver.FilterMessage(message).All()) > 0
 }
 
 func fakeConfigAndLogger() (acmedns.AcmeDnsConfig, *zap.SugaredLogger, *observer.ObservedLogs) {
@@ -76,23 +73,6 @@ func (r *resolver) lookup(host string, qtype uint16) (*dns.Msg, error) {
 	return in, nil
 }
 
-func hasExpectedTXTAnswer(answer []dns.RR, cmpTXT string) error {
-	for _, record := range answer {
-		// We expect only one answer, so no need to loop through the answer slice
-		if rec, ok := record.(*dns.TXT); ok {
-			for _, txtValue := range rec.Txt {
-				if txtValue == cmpTXT {
-					return nil
-				}
-			}
-		} else {
-			errmsg := fmt.Sprintf("Got answer of unexpected type [%q]", answer[0])
-			return errors.New(errmsg)
-		}
-	}
-	return errors.New("Expected answer not found")
-}
-
 func TestQuestionDBError(t *testing.T) {
 	config, logger, _ := fakeConfigAndLogger()
 	config.General.Listen = "127.0.0.1:15353"
@@ -327,7 +307,26 @@ func TestResolveTXT(t *testing.T) {
 			}
 		}
 	}
-}*/
+}
+
+func hasExpectedTXTAnswer(answer []dns.RR, cmpTXT string) error {
+	for _, record := range answer {
+		// We expect only one answer, so no need to loop through the answer slice
+		if rec, ok := record.(*dns.TXT); ok {
+			for _, txtValue := range rec.Txt {
+				if txtValue == cmpTXT {
+					return nil
+				}
+			}
+		} else {
+			errmsg := fmt.Sprintf("Got answer of unexpected type [%q]", answer[0])
+			return errors.New(errmsg)
+		}
+	}
+	return errors.New("Expected answer not found")
+}
+
+*/
 
 func TestCaseInsensitiveResolveA(t *testing.T) {
 	resolv := resolver{server: "127.0.0.1:15353"}