diff --git a/Makefile.am b/Makefile.am
index bfedc42a..0bd225aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -300,9 +300,8 @@ tests_unittests_unittests_LDADD = -lcmocka
 TESTS += tests/functionaltests/functionaltests
 check_PROGRAMS += tests/functionaltests/functionaltests
 tests_functionaltests_functionaltests_SOURCES = $(functionaltest_sources)
-tests_functionaltests_functionaltests_CPPFLAGS = -Itests/ -I$(top_srcdir)/external/stabber
-tests_functionaltests_functionaltests_CFLAGS = $(AM_CFLAGS) -I/usr/include/tcl8.6 -I/usr/include/tcl8.5 -I$(top_srcdir)/external/stabber
-tests_functionaltests_functionaltests_LDFLAGS = -L$(top_srcdir)/external/stabber/.libs -Wl,-rpath,$(top_srcdir)/external/stabber/.libs
+tests_functionaltests_functionaltests_CPPFLAGS = -Itests/
+tests_functionaltests_functionaltests_CFLAGS = $(AM_CFLAGS) -I/usr/include/tcl8.6 -I/usr/include/tcl8.5
 tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl8.6
 
 
diff --git a/configure.ac b/configure.ac
index e52fc8fc..ba1f5d32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -375,8 +375,12 @@ AM_CONDITIONAL([HAVE_STABBER], [false])
 AC_CHECK_LIB([stabber], [stbbr_start], [AM_CONDITIONAL([HAVE_STABBER], [true])],
     [AC_MSG_NOTICE([libstabber not found, will not be able to run functional tests])])
 AM_CONDITIONAL([HAVE_EXPECT], [false])
+dnl libexpect on Debian/Ubuntu requires -ltcl8.6 for linking
+saved_LIBS="$LIBS"
+LIBS="$LIBS -ltcl8.6"
 AC_CHECK_LIB([expect], [exp_expectl], [AM_CONDITIONAL([HAVE_EXPECT], [true])],
     [AC_MSG_NOTICE([libexpect not found, will not be able to run functional tests])])
+LIBS="$saved_LIBS"
 
 ## Default parameters
 AM_CFLAGS="$AM_CFLAGS -Wall -Wno-deprecated-declarations -std=gnu99 -ggdb3"
diff --git a/external/stabber b/external/stabber
deleted file mode 160000
index fdb615a2..00000000
--- a/external/stabber
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fdb615a2138bcf5125708c83f7d4e9ed5d121acf