diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 50687dfe993..6390c04c91e 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -7096,6 +7096,12 @@ tramp--test-mock-p
   (string-equal
    "mock" (file-remote-p ert-remote-temporary-file-directory 'method)))

+(defun tramp--test-netbsd-p ()
+  "Check, whether the remote host runs NetBSD."
+  ;; We must refill the cache.  `file-truename' does it.
+  (file-truename ert-remote-temporary-file-directory)
+  (ignore-errors (tramp-check-remote-uname tramp-test-vec "NetBSD")))
+
 (defun tramp--test-openbsd-p ()
   "Check, whether the remote host runs OpenBSD."
   ;; We must refill the cache.  `file-truename' does it.
@@ -7333,9 +7339,11 @@ tramp--test-check-files

 		;; Check symlink in `directory-files-and-attributes'.
 		;; It does not work in the "smb" case, only relative
-		;; symlinks to existing files are shown there.
+		;; symlinks to existing files are shown there.  On
+		;; NetBSD, there are problems with loooong file names,
+		;; see Bug#65324.
 		(tramp--test-ignore-make-symbolic-link-error
-		  (unless (tramp--test-smb-p)
+		  (unless (or (tramp--test-netbsd-p) (tramp--test-smb-p))
 		    (make-symbolic-link file2 file3)
 		    (should (file-symlink-p file3))
 		    (should
@@ -7407,6 +7415,8 @@ tramp--test-check-files
 ;; These tests are inspired by Bug#17238.
 (ert-deftest tramp-test41-special-characters ()
   "Check special characters in file names."
+  (tramp--test-instrument-test-case 10
+  (setq tramp-debug-to-file t)
   (skip-unless (tramp--test-enabled))
   (skip-unless (not (getenv "EMACS_HYDRA_CI"))) ; SLOW ~ 245s
   (skip-unless (not (tramp--test-rsync-p)))
@@ -7468,7 +7478,7 @@ tramp-test41-special-characters
     ;; Simplify test in order to speed up.
     (apply #'tramp--test-check-files
 	   (if (tramp--test-expensive-test-p)
-	       files (list (string-join files ""))))))
+	       files (list (string-join files "")))))))

 (tramp--test-deftest-with-stat tramp-test41-special-characters)