diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6426f3c9..2e1a7f13 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,13 +37,13 @@ kkdcp_parsing_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS)
 json_escape_SOURCES = ../src/common-json.c json-escape.c
 json_escape_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS)
 
-ipv4_prefix_SOURCES = ../src/common.c ../src/common.h ipv4-prefix.c
+ipv4_prefix_SOURCES = ../src/ip-util.c ../src/ip-util.h ipv4-prefix.c
 ipv4_prefix_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS)
 
 str_test_SOURCES = ../src/str.c ../src/str.h str-test.c
 str_test_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS)
 
-ipv6_prefix_SOURCES = ../src/common.c ../src/common.h ipv6-prefix.c
+ipv6_prefix_SOURCES = ../src/ip-util.c ../src/ip-util.h ipv6-prefix.c
 ipv6_prefix_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS)
 
 check_PROGRAMS = str-test ipv4-prefix ipv6-prefix kkdcp-parsing json-escape
diff --git a/tests/ocpasswd-test b/tests/ocpasswd-test
index 2007a984..d771d046 100755
--- a/tests/ocpasswd-test
+++ b/tests/ocpasswd-test
@@ -18,7 +18,7 @@
 # along with GnuTLS; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-OCPASSWD="${OCPASSWD:-../src/ocpasswd}"
+OCPASSWD="${OCPASSWD:-../src/ocpasswd/ocpasswd}"
 srcdir=${srcdir:-.}
 
 echo "Testing ocpasswd"