diff --git a/Library/token-manipulation/main.fmf b/Library/token-manipulation/main.fmf
index bc721e6..c9232bf 100644
--- a/Library/token-manipulation/main.fmf
+++ b/Library/token-manipulation/main.fmf
@@ -4,6 +4,9 @@ contact: Karel Srot <ksrot@redhat.com>
 component: []
 test: ./runtest.sh
 framework: beakerlib
+require:
+    - url: https://src.fedoraproject.org/tests/opencryptoki.git
+      name: /Library/token-manipulation
 recommend:
 - opencryptoki
 - opencryptoki-swtok
diff --git a/Library/token-manipulation/runtest.sh b/Library/token-manipulation/runtest.sh
index 499e80c..51fc083 100755
--- a/Library/token-manipulation/runtest.sh
+++ b/Library/token-manipulation/runtest.sh
@@ -34,7 +34,7 @@ PHASE=${PHASE:-Test}
 
 rlJournalStart
     rlPhaseStartSetup
-        rlRun "rlImport ./token-manipulation"
+        rlRun "rlImport opencryptoki/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 e2898ed..d4a9e28 100644
--- a/Sanity/init-token-as-a-nonroot-user/main.fmf
+++ b/Sanity/init-token-as-a-nonroot-user/main.fmf
@@ -7,7 +7,8 @@ test: ./runtest.sh
 framework: beakerlib
 require:
 - library(nvr/nvr)
-#- library(opencryptoki/token-manipulation)  # not needed as it is in the same repo
+- url: https://src.fedoraproject.org/tests/opencryptoki.git
+  name: /Library/token-manipulation
 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 88b636d..e0e0d80 100755
--- a/Sanity/init-token-as-a-nonroot-user/runtest.sh
+++ b/Sanity/init-token-as-a-nonroot-user/runtest.sh
@@ -38,8 +38,8 @@ rlJournalStart
     rlPhaseStartSetup
         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 ./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//'`
+	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//'`
 	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 78261cc..55d6cd1 100644
--- a/Sanity/init-tokens-as-root/main.fmf
+++ b/Sanity/init-tokens-as-root/main.fmf
@@ -8,7 +8,8 @@ test: ./runtest.sh
 framework: beakerlib
 require:
 - library(nvr/nvr)
-#- library(opencryptoki/token-manipulation)  # not needed as it is in the same repo
+- url: https://src.fedoraproject.org/tests/opencryptoki.git
+  name: /Library/token-manipulation
 recommend:
 - opencryptoki
 - opencryptoki-swtok
diff --git a/Sanity/init-tokens-as-root/runtest.sh b/Sanity/init-tokens-as-root/runtest.sh
index 9833c2c..e57e47f 100755
--- a/Sanity/init-tokens-as-root/runtest.sh
+++ b/Sanity/init-tokens-as-root/runtest.sh
@@ -35,7 +35,7 @@ TESTDIR=`pwd`
 rlJournalStart
     rlPhaseStartSetup
         rlRun "rlImport nvr/nvr" || rlDie "cannot import distribution/nvr library"
-		rlRun "rlImport ./token-manipulation" || rlDie "Could not import opencryptoki/token-manipulation library"
+		rlRun "rlImport opencryptoki/token-manipulation" || rlDie "Could not import opencryptoki/token-manipulation library"
         rlAssertRpm $PACKAGE
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "pushd $TmpDir"