diff --git a/tests/Makefile.tests b/tests/Makefile.tests
index e865daf..cc034bb 100644
--- a/tests/Makefile.tests
+++ b/tests/Makefile.tests
@@ -49,18 +49,6 @@ check:	tests
 checkv:	tests
 	cd $(TESTS_PREFIX); ./run_tests.sh -v
 
-func:	tests
-	cd $(TESTS_PREFIX); ./run_tests.sh -t func
-
-funcv:	tests
-	cd $(TESTS_PREFIX); ./run_tests.sh -t func -v
-
-stress:	tests
-	cd $(TESTS_PREFIX); ./run_tests.sh -t stress
-
-stressv: tests
-	cd $(TESTS_PREFIX); ./run_tests.sh -t stress -v
-
 ifneq ($(DEPTARGETS),)
 -include $(TESTS_DEPFILES)
 endif
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index d47677d..3973730 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -49,7 +49,7 @@ tree1_tests () {
     run_test nop_node $TREE
 }
 
-functional_tests () {
+libfdt_tests () {
     # Make sure we don't have stale blobs lying around
     rm -f *.test.dtb
 
@@ -86,10 +86,6 @@ functional_tests () {
     run_test truncated_property
 }
 
-stress_tests () {
-    ITERATIONS=10           # Number of iterations for looping tests
-}
-
 while getopts "vdt:" ARG ; do
     case $ARG in
 	"v")
@@ -102,16 +98,13 @@ while getopts "vdt:" ARG ; do
 done
 
 if [ -z "$TESTSETS" ]; then
-    TESTSETS="func stress"
+    TESTSETS="libfdt"
 fi
 
 for set in $TESTSETS; do
     case $set in
-	"func")
-	    functional_tests
-	    ;;
-	"stress")
-	    stress_tests
+	"libfdt")
+	    libfdt_tests
 	    ;;
     esac
 done