diff --git a/.gitignore b/.gitignore
index c422daf..a7eac88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ clog
 /Archive_Tar-1.3.15.tgz
 /Archive_Tar-1.3.16.tgz
 /Archive_Tar-1.4.0.tgz
+/Console_Getopt-1.4.1.tgz
+/Structures_Graph-1.1.1.tgz
diff --git a/php-pear.spec b/php-pear.spec
index 4f5fba5..fc081ac 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -8,23 +8,23 @@
 %global peardir %{_datadir}/pear
 %global metadir %{_localstatedir}/lib/pear
 
-%global getoptver 1.4.0
+%global getoptver 1.4.1
 %global arctarver 1.4.0
 # https://pear.php.net/bugs/bug.php?id=19367
 # Structures_Graph 1.0.4 - incorrect FSF address
-%global structver 1.1.0
+%global structver 1.1.1
 %global xmlutil   1.3.0
 
 # Tests are only run with rpmbuild --with tests
 # Can't be run in mock / koji because PEAR is the first package
-%global with_tests       %{?_with_tests:1}%{!?_with_tests:0}
+%global with_tests 0%{?_with_tests:1}
 
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.9.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 # PEAR, Archive_Tar, XML_Util, Console_Getopt are BSD
 # Structures_Graph is LGPLv3+
@@ -226,20 +226,28 @@ grep -rl $RPM_BUILD_ROOT $RPM_BUILD_ROOT && exit 1
 
 
 %if %{with_tests}
+cp /etc/php.ini .
+echo "include_path=.:$RPM_BUILD_ROOT%{peardir}:/usr/share/php" >>php.ini
+export PHPRC=$PWD/php.ini
 LOG=$PWD/rpmlog
 ret=0
 
 cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/Structures_Graph/tests
 phpunit \
-   -d date.timezone=UTC \
-   --include-path=$RPM_BUILD_ROOT%{pear_phpdir} \
    AllTests || ret=1
 
 cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/XML_Util/tests
-php -d include_path=.:$RPM_BUILD_ROOT%{pear_phpdir} \
+%{_bindir}/php \
    $RPM_BUILD_ROOT/usr/share/pear/pearcmd.php \
    run-tests \
    | tee $LOG
+
+cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/Console_Getopt/tests
+%{_bindir}/php \
+   $RPM_BUILD_ROOT/usr/share/pear/pearcmd.php \
+   run-tests \
+   | tee -a $LOG
+
 grep "FAILED TESTS" $LOG && ret=1
 
 exit $ret
@@ -343,6 +351,10 @@ fi
 
 
 %changelog
+* Tue Jul 21 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-12
+- update Console_Getopt to 1.4.1
+- update Structures_Graph to 1.1.1
+
 * Mon Jul 20 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-10
 - update Archive_Tar to 1.4.0
 
diff --git a/sources b/sources
index e3f7609..53864cc 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 f547764b567155219a87273b23b148fb  Archive_Tar-1.4.0.tgz
-72c19ce19d5c6fab89ec79fa14b10c4b  Console_Getopt-1.4.0.tgz
+f9276d111618284efb3f900b6f753c6a  Console_Getopt-1.4.1.tgz
 f44a56765988dafbe348828cac2562ca  PEAR-1.9.5.tgz
-d7bb6744ee4027df817c5ee6ecbb9329  Structures_Graph-1.1.0.tgz
+ee63a3d24c94338af90334f3dd42c518  Structures_Graph-1.1.1.tgz
 7639263e35f5d2bc3cdee52484a2f366  XML_Util-1.3.0.tgz