diff --git a/Makefile b/Makefile
index 38484e63..6e995139 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ LDFLAGS-os-FreeBSD = -L/usr/local/lib
 
 LIBS-os-Haiku = -lnetwork -lbe
 
-CPPFLAGS-os-OpenBSD = -DKAK_BIN_PATH="$(bindir)/kak" -I/usr/local/include
+CPPFLAGS-os-OpenBSD = -DKAK_BIN_PATH=\"$(bindir)/kak\" -I/usr/local/include
 LDFLAGS-os-OpenBSD = -L/usr/local/lib
 mandir-os-OpenBSD = $(DESTDIR)$(PREFIX)/man/man1
 
@@ -136,6 +136,9 @@ doc/kak.1.gz: doc/kak.1
 
 check: test
 test: src/kak
+	if [ $(os) = OpenBSD ]; then \
+        	export KAKOUNE_RUNTIME=$$PWD/share/kak; \
+	fi && \
 	cd test && ./run
 
 TAGS: tags
diff --git a/src/file.cc b/src/file.cc
index be298964..c505f235 100644
--- a/src/file.cc
+++ b/src/file.cc
@@ -666,6 +666,7 @@ String get_kak_binary_path()
     buffer[res] = '\0';
     return buffer;
 #elif defined(__OpenBSD__)
+    (void)buffer;
     return KAK_BIN_PATH;
 #elif defined(__sun__)
     ssize_t res = readlink("/proc/self/path/a.out", buffer, 2048);