diff --git a/app-admin/keepassxc/keepassxc-2.3.4.recipe b/app-admin/keepassxc/keepassxc-2.3.4.recipe
index 067373daa..1d7c1fa43 100644
--- a/app-admin/keepassxc/keepassxc-2.3.4.recipe
+++ b/app-admin/keepassxc/keepassxc-2.3.4.recipe
@@ -133,5 +133,6 @@ INSTALL()
 
 TEST()
 {
+	cd build
 	make test	
 }
diff --git a/app-admin/keepassxc/patches/keepassxc-2.3.4.patchset b/app-admin/keepassxc/patches/keepassxc-2.3.4.patchset
index 6b3b6f469..ad8d7f0e7 100644
--- a/app-admin/keepassxc/patches/keepassxc-2.3.4.patchset
+++ b/app-admin/keepassxc/patches/keepassxc-2.3.4.patchset
@@ -1,18 +1,18 @@
-From 8f01c028bc37fe1c301b4e0fb4a89da36800bccb Mon Sep 17 00:00:00 2001
+From 0fd57d499ce574e2a13388a1c218ebcfb4086145 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Tue, 12 Feb 2019 15:57:57 +0300
 Subject: Haiku patch
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 70f1479..08d4918 100644
+index 70f1479..3ad57f2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -170,11 +170,13 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
    add_gcc_compiler_flags("-Werror")
  endif()
  
-+if (HAIKU)
++if (NOT HAIKU)
  if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR CMAKE_COMPILER_IS_CLANGXX)
      add_gcc_compiler_flags("-fstack-protector-strong")
  else()