diff --git a/Library/token-manipulation/runtest.sh b/Library/token-manipulation/runtest.sh
index 51fc083..499e80c 100755
--- a/Library/token-manipulation/runtest.sh
+++ b/Library/token-manipulation/runtest.sh
@@ -34,7 +34,7 @@ PHASE=${PHASE:-Test}
 
 rlJournalStart
     rlPhaseStartSetup
-        rlRun "rlImport opencryptoki/token-manipulation"
+        rlRun "rlImport ./token-manipulation"
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "pushd $TmpDir"
     rlPhaseEnd
diff --git a/Sanity/init-token-as-a-nonroot-user/main.fmf b/Sanity/init-token-as-a-nonroot-user/main.fmf
index 48fe880..e2898ed 100644
--- a/Sanity/init-token-as-a-nonroot-user/main.fmf
+++ b/Sanity/init-token-as-a-nonroot-user/main.fmf
@@ -6,8 +6,8 @@ component:
 test: ./runtest.sh
 framework: beakerlib
 require:
-- library(distribution/nvr)
-- library(opencryptoki/token-manipulation)
+- library(nvr/nvr)
+#- library(opencryptoki/token-manipulation)  # not needed as it is in the same repo
 recommend:
 - opencryptoki
 - opencryptoki-swtok
diff --git a/Sanity/init-token-as-a-nonroot-user/runtest.sh b/Sanity/init-token-as-a-nonroot-user/runtest.sh
index 77638af..88b636d 100755
--- a/Sanity/init-token-as-a-nonroot-user/runtest.sh
+++ b/Sanity/init-token-as-a-nonroot-user/runtest.sh
@@ -36,10 +36,10 @@ TESTDIR=`pwd`
 
 rlJournalStart
     rlPhaseStartSetup
-        rlRun "rlImport distribution/nvr" || rlDie "cannot import distribution/nvr library"
+        rlRun "rlImport nvr/nvr" || rlDie "cannot import distribution/nvr library"
 	# need to find out the library path so a user can import it too
-	rlRun "rlImport opencryptoki/token-manipulation" 2> import.log || rlDie "Could not import opencryptoki/token-manipulation library"
-	LIBPATH=`grep 'Will try to import opencryptoki\/token-manipulation from' import.log | sed 's/^.*token-manipulation from//'`
+	rlRun "rlImport ./token-manipulation" 2> import.log || rlDie "Could not import opencryptoki/token-manipulation library"
+	LIBPATH=`grep 'Will try to import .\/token-manipulation from' import.log | sed 's/^.*token-manipulation from//'`
 	echo "LIBPATH=$LIBPATH"
         rlAssertRpm $PACKAGE
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
diff --git a/Sanity/init-tokens-as-root/main.fmf b/Sanity/init-tokens-as-root/main.fmf
index a188a30..78261cc 100644
--- a/Sanity/init-tokens-as-root/main.fmf
+++ b/Sanity/init-tokens-as-root/main.fmf
@@ -7,8 +7,8 @@ component:
 test: ./runtest.sh
 framework: beakerlib
 require:
-- library(distribution/nvr)
-- library(opencryptoki/token-manipulation)
+- library(nvr/nvr)
+#- library(opencryptoki/token-manipulation)  # not needed as it is in the same repo
 recommend:
 - opencryptoki
 - opencryptoki-swtok
diff --git a/Sanity/init-tokens-as-root/runtest.sh b/Sanity/init-tokens-as-root/runtest.sh
index ca939d1..9833c2c 100755
--- a/Sanity/init-tokens-as-root/runtest.sh
+++ b/Sanity/init-tokens-as-root/runtest.sh
@@ -34,8 +34,8 @@ TESTDIR=`pwd`
 
 rlJournalStart
     rlPhaseStartSetup
-        rlRun "rlImport distribution/nvr" || rlDie "cannot import distribution/nvr library"
-		rlRun "rlImport opencryptoki/token-manipulation" || rlDie "Could not import opencryptoki/token-manipulation library"
+        rlRun "rlImport nvr/nvr" || rlDie "cannot import distribution/nvr library"
+		rlRun "rlImport ./token-manipulation" || rlDie "Could not import opencryptoki/token-manipulation library"
         rlAssertRpm $PACKAGE
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "pushd $TmpDir"