diff --git a/Sanity/basic-sanity/main.fmf b/Sanity/basic-sanity/main.fmf
index aaf6068..53442f0 100644
--- a/Sanity/basic-sanity/main.fmf
+++ b/Sanity/basic-sanity/main.fmf
@@ -10,6 +10,7 @@ require:
   - postgresql-jdbc
   - postgresql-server
   - postgresql
+  - diffutils
 duration: 25m
 tag:
   - Tier1
diff --git a/Sanity/upstream-testsuite/main.fmf b/Sanity/upstream-testsuite/main.fmf
index 85f8e19..9792ac8 100644
--- a/Sanity/upstream-testsuite/main.fmf
+++ b/Sanity/upstream-testsuite/main.fmf
@@ -34,6 +34,5 @@ require:
   - postgresql-jdbc-tests
   - junit5
   - classloader-leak-test-framework
-  - bcel
   - apache-commons-lang3
 duration: 35m
diff --git a/Sanity/upstream-testsuite/runtest.sh b/Sanity/upstream-testsuite/runtest.sh
index 3cf1504..19b34c4 100755
--- a/Sanity/upstream-testsuite/runtest.sh
+++ b/Sanity/upstream-testsuite/runtest.sh
@@ -43,7 +43,7 @@ rlJournalStart
         rlLog "$(readlink -f $(which $JAVAC))"
         rlLog "$(rpm -qf $CONNECTOR_JAR)"
         rlAssertRpm --all
-        rlRun "useradd mockbuild -m"
+        rlRun "useradd testuser -m"
         
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "chmod a+rwx $TmpDir" 0 "fixing directory permissions"
@@ -51,7 +51,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest
-        rlRun "su mockbuild $OLDPWD/usertest.sh"
+        rlRun "su testuser $OLDPWD/usertest.sh"
     rlPhaseEnd
 
     rlPhaseStartCleanup