diff --git a/app/BUILD.bazel b/app/BUILD.bazel
index 7009311a5b5..5200dfc73ba 100644
--- a/app/BUILD.bazel
+++ b/app/BUILD.bazel
@@ -496,10 +496,10 @@ android_library(
         "//third_party:androidx_viewpager2_viewpager2",
         "//third_party:androidx_viewpager_viewpager",
         "//third_party:circularimageview_circular_image_view",
-        "//third_party:com_chaos_view_pinview",
         "//third_party:com_google_android_flexbox",
         "//third_party:com_google_android_material_material",
         "//third_party:de_hdodenhof_circleimageview",
+        "//third_party:io_github_chaosleung_pinview",
         "//third_party:javax_annotation_javax_annotation-api_jar",
         "//third_party:nl_dionsegijn_konfetti",
     ],
@@ -606,8 +606,8 @@ android_library(
         "//third_party:androidx_lifecycle_lifecycle-livedata-core",
         "//third_party:androidx_lifecycle_lifecycle-livedata-ktx",
         "//third_party:circularimageview_circular_image_view",
-        "//third_party:com_chaos_view_pinview",
         "//third_party:com_google_android_material_material",
+        "//third_party:io_github_chaosleung_pinview",
         "//utility",
     ],
 )
@@ -690,6 +690,7 @@ TEST_DEPS = [
     "//testing",
     "//testing/src/main/java/org/oppia/android/testing/espresso:edit_text_input_action",
     "//testing/src/main/java/org/oppia/android/testing/espresso:generic_view_matchers",
+    "//testing/src/main/java/org/oppia/android/testing/espresso:image_view_matcher",
     "//testing/src/main/java/org/oppia/android/testing/espresso:konfetti_view_matcher",
     "//testing/src/main/java/org/oppia/android/testing/mockito",
     "//testing/src/main/java/org/oppia/android/testing/robolectric:is_on_robolectric",
diff --git a/app/build.gradle b/app/build.gradle
index ac56bf57d8f..203ac3c71c6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -110,7 +110,7 @@ dependencies {
       'androidx.multidex:multidex:2.0.1',
       'androidx.recyclerview:recyclerview:1.0.0',
       'androidx.work:work-runtime-ktx:2.4.0',
-      'com.chaos.view:pinview:1.4.4',
+      'io.github.chaosleung:pinview:1.4.4',
       'com.github.bumptech.glide:glide:4.11.0',
       'com.google.android:flexbox:2.0.1',
       'com.google.android.material:material:1.2.0-alpha02',
diff --git a/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel
index a034aed2425..97ff8eb1200 100644
--- a/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel
+++ b/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel
@@ -45,4 +45,16 @@ kt_android_library(
     ],
 )
 
+kt_android_library(
+    name = "image_view_matcher",
+    testonly = True,
+    srcs = [
+        "ImageViewMatcher.kt",
+    ],
+    visibility = ["//:oppia_testing_visibility"],
+    deps = [
+        "//third_party:androidx_test_espresso_espresso-core",
+    ],
+)
+
 dagger_rules()
diff --git a/third_party/versions.bzl b/third_party/versions.bzl
index ecd07917347..363702697f1 100644
--- a/third_party/versions.bzl
+++ b/third_party/versions.bzl
@@ -43,7 +43,6 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = {
     "androidx.work:work-runtime": "2.4.0",
     "androidx.work:work-runtime-ktx": "2.4.0",
     "com.android.support:support-annotations": "28.0.0",
-    "com.chaos.view:pinview": "1.4.4",
     "com.crashlytics.sdk.android:crashlytics": "2.9.8",
     "com.github.bumptech.glide:compiler": "4.11.0",
     "com.github.bumptech.glide:glide": "4.11.0",
@@ -61,6 +60,7 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = {
     "com.squareup.retrofit2:retrofit": "2.9.0",
     "de.hdodenhof:circleimageview": "3.0.1",
     "io.fabric.sdk.android:fabric": "1.4.7",
+    "io.github.chaosleung:pinview": "1.4.4",
     "javax.annotation:javax.annotation-api:jar": "1.3.2",
     "javax.inject:javax.inject": "1",
     "nl.dionsegijn:konfetti": "1.2.5",