diff --git a/Makefile.am b/Makefile.am
index 25f1a6af..9bb41482 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -287,7 +287,7 @@ library_libproc2_la_SOURCES = \
 	library/uptime.c \
 	library/include/xtra-procps-debug.h
 
-library_libproc2_la_includedir = $(includedir)/procps/
+library_libproc2_la_includedir = $(includedir)/libproc2/
 library_libproc2_la_include_HEADERS = \
 	library/include/diskstats.h \
 	library/include/meminfo.h \
diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
index 66db9f1f..ca73dda3 100644
--- a/testsuite/config/unix.exp
+++ b/testsuite/config/unix.exp
@@ -148,7 +148,7 @@ proc expect_spawn_retval { test retval } {
 proc make_pipeproc { } {
     global pipeproc_pid pipeproc_spawnid topdir
 
-    set testproc_realpath "${topdir}/lib/test_process"
+    set testproc_realpath "${topdir}/src/tests/test_process"
 
     set pipeproc_pid [ spawn $testproc_realpath ]
     set pipeproc_spawnid $spawn_id
@@ -157,7 +157,7 @@ proc make_pipeproc { } {
 proc make_testproc { } {
     global testproc_path testproc_comm testproc_arg_str testproc1_pid testproc2_pid topdir
 
-    set testproc_realpath "${topdir}/lib/test_process"
+    set testproc_realpath "${topdir}/src/tests/test_process"
     set testproc_comm "spcorp"
 
     set testproc_path [ exec mktemp -u ]
@@ -189,7 +189,7 @@ proc make_testproc { } {
 proc make_testshm_proc { } {
     global testshmproc_pid testshm_spawnid topdir shmid
 
-    set testshm_realpath "${topdir}/lib/test_shm"
+    set testshm_realpath "${topdir}/src/tests/test_shm"
 
     set testshmproc_pid [ spawn $testshm_realpath ]
     set testshmproc_spawnid $spawn_id
diff --git a/testsuite/lib.test/fileutils.exp b/testsuite/lib.test/fileutils.exp
index 0f246c6a..3eaf654b 100644
--- a/testsuite/lib.test/fileutils.exp
+++ b/testsuite/lib.test/fileutils.exp
@@ -2,7 +2,7 @@
 # Testsuite for lib/fileutils program
 #
 
-set noarg "${topdir}lib/test_fileutils"
+set noarg "${topdir}src/tests/test_fileutils"
 
 set test "without argument"
 spawn $noarg
diff --git a/testsuite/lib.test/fileutils_badfd.sh b/testsuite/lib.test/fileutils_badfd.sh
index 19a13105..12c5b83b 100755
--- a/testsuite/lib.test/fileutils_badfd.sh
+++ b/testsuite/lib.test/fileutils_badfd.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${PWD}/../lib/test_fileutils >&-
+${PWD}/../src/tests/test_fileutils >&-
diff --git a/testsuite/lib.test/fileutils_full.sh b/testsuite/lib.test/fileutils_full.sh
index 550e581e..ea9b55ad 100755
--- a/testsuite/lib.test/fileutils_full.sh
+++ b/testsuite/lib.test/fileutils_full.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${PWD}/../lib/test_fileutils > /dev/full
+${PWD}/../src/tests/test_fileutils > /dev/full
diff --git a/testsuite/lib.test/strutils.exp b/testsuite/lib.test/strutils.exp
index 7afa8f78..72d1fcda 100644
--- a/testsuite/lib.test/strutils.exp
+++ b/testsuite/lib.test/strutils.exp
@@ -2,7 +2,7 @@
 # Testsuite for lib/strutils program
 #
 
-set teststr "${topdir}lib/test_strutils"
+set teststr "${topdir}src/tests/test_strutils"
 
 set test "without argument"
 spawn $teststr