diff --git a/metrics/fds_linux.go b/metrics/fds_linux.go
index c4e6e0b99..486e1a575 100644
--- a/metrics/fds_linux.go
+++ b/metrics/fds_linux.go
@@ -9,6 +9,8 @@ import (
 	"log"
 	"syscall"
 	"unsafe"
+
+	"golang.org/x/sys/unix"
 )
 
 func currentFDs() int {
@@ -81,10 +83,10 @@ func parseDirEnt(dirent *syscall.Dirent, buf []byte) (consumed int, name []byte)
 var procSelfFDName = []byte("/proc/self/fd\x00")
 
 func openProcSelfFD() (fd int, err error) {
+	var dirfd int = unix.AT_FDCWD
 	for {
-		r0, _, e1 := syscall.Syscall(syscall.SYS_OPEN,
-			uintptr(unsafe.Pointer(&procSelfFDName[0])),
-			0, 0)
+		r0, _, e1 := syscall.Syscall(unix.SYS_OPENAT, uintptr(dirfd),
+			uintptr(unsafe.Pointer(&procSelfFDName[0])), 0)
 		if e1 == 0 {
 			return int(r0), nil
 		}
diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go
index dbc15529f..d004d5fac 100644
--- a/metrics/metrics_test.go
+++ b/metrics/metrics_test.go
@@ -34,10 +34,11 @@ func TestCurrentFileDescriptors(t *testing.T) {
 			t.Fatal(err)
 		}
 		defer f.Close()
+		t.Logf("fds for #%v = %v", i, CurrentFDs())
 	}
 
 	n2 := CurrentFDs()
-	if n2 != n+extra {
+	if n2 < n+extra {
 		t.Errorf("fds changed from %v => %v, want to %v", n, n2, n+extra)
 	}
 }