--- scripts/lib/Tinderbox/MakeCache.pm.orig	Tue Dec 13 21:53:34 2011
+++ scripts/lib/Tinderbox/MakeCache.pm	Tue Dec 13 21:53:54 2011
@@ -179,7 +179,11 @@
 sub TestDepends {
         my $self = shift;
         my $port = shift;
-        return $self->_getList($port, 'TEST_DEPENDS');
+        my @rundeps = $self->_getList($port, 'RUN_DEPENDS');
+        my @testdeps = $self->_getList($port, 'TEST_DEPENDS');
+
+        @testdeps = (@testdeps, @rundeps);
+        return @testdeps;
 }
 
 # A close approximation to the 'ignore-list' target