diff --git a/tests/integration/targets/flatpak/aliases b/tests/integration/targets/flatpak/aliases
index 59e306f8b4..39291d435b 100644
--- a/tests/integration/targets/flatpak/aliases
+++ b/tests/integration/targets/flatpak/aliases
@@ -1,4 +1,4 @@
-unsupported
+shippable/posix/group3
 destructive
 skip/aix
 skip/freebsd
@@ -6,4 +6,3 @@ skip/osx
 skip/macos
 skip/rhel
 needs/root
-needs/privileged
diff --git a/tests/integration/targets/flatpak/meta/main.yml b/tests/integration/targets/flatpak/meta/main.yml
index 07faa21776..314f77eba9 100644
--- a/tests/integration/targets/flatpak/meta/main.yml
+++ b/tests/integration/targets/flatpak/meta/main.yml
@@ -1,2 +1,3 @@
 dependencies:
   - prepare_tests
+  - setup_flatpak_remote
diff --git a/tests/integration/targets/flatpak/tasks/check_mode.yml b/tests/integration/targets/flatpak/tasks/check_mode.yml
index 3186fd2830..e248510e06 100644
--- a/tests/integration/targets/flatpak/tasks/check_mode.yml
+++ b/tests/integration/targets/flatpak/tasks/check_mode.yml
@@ -4,8 +4,8 @@
 
 - name: Test addition of absent flatpak (check mode)
   flatpak:
-    name: org.gnome.Characters
-    remote: flathub
+    name: com.dummy.App1
+    remote: dummy-remote
     state: present
   register: addition_result
   check_mode: true
@@ -18,8 +18,8 @@
 
 - name: Test non-existent idempotency of addition of absent flatpak (check mode)
   flatpak:
-    name: org.gnome.Characters
-    remote: flathub
+    name: com.dummy.App1
+    remote: dummy-remote
     state: present
   register: double_addition_result
   check_mode: true
@@ -36,7 +36,7 @@
 
 - name: Test removal of absent flatpak check mode
   flatpak:
-    name: org.gnome.Characters
+    name: com.dummy.App1
     state: absent
   register: removal_result
   check_mode: true
@@ -51,8 +51,8 @@
 
 - name: Test addition of absent flatpak with url (check mode)
   flatpak:
-    name: https://flathub.org/repo/appstream/org.gnome.Characters.flatpakref
-    remote: flathub
+    name: file:///tmp/flatpak/repo/com.dummy.App1.flatpakref
+    remote: dummy-remote
     state: present
   register: url_addition_result
   check_mode: true
@@ -65,8 +65,8 @@
 
 - name: Test non-existent idempotency of addition of absent flatpak with url (check mode)
   flatpak:
-    name: https://flathub.org/repo/appstream/org.gnome.Characters.flatpakref
-    remote: flathub
+    name: file:///tmp/flatpak/repo/com.dummy.App1.flatpakref
+    remote: dummy-remote
     state: present
   register: double_url_addition_result
   check_mode: true
@@ -85,7 +85,7 @@
 
 - name: Test removal of absent flatpak with url not doing anything (check mode)
   flatpak:
-    name: https://flathub.org/repo/appstream/org.gnome.Characters.flatpakref
+    name: file:///tmp/flatpak/repo/com.dummy.App1.flatpakref
     state: absent
   register: url_removal_result
   check_mode: true
@@ -103,8 +103,8 @@
 
 - name: Test addition of present flatpak (check mode)
   flatpak:
-    name: org.gnome.Calculator
-    remote: flathub
+    name: com.dummy.App8
+    remote: dummy-remote
     state: present
   register: addition_present_result
   check_mode: true
@@ -119,7 +119,7 @@
 
 - name: Test removal of present flatpak (check mode)
   flatpak:
-    name: org.gnome.Calculator
+    name: com.dummy.App8
     state: absent
   register: removal_present_result
   check_mode: true
@@ -132,7 +132,7 @@
 
 - name: Test non-existent idempotency of removal (check mode)
   flatpak:
-    name: org.gnome.Calculator
+    name: com.dummy.App8
     state: absent
   register: double_removal_present_result
   check_mode: true
@@ -149,8 +149,8 @@
 
 - name: Test addition with url of present flatpak (check mode)
   flatpak:
-    name: https://flathub.org/repo/appstream/org.gnome.Calculator.flatpakref
-    remote: flathub
+    name: file:///tmp/flatpak/repo/com.dummy.App8.flatpakref
+    remote: dummy-remote
     state: present
   register: url_addition_present_result
   check_mode: true
@@ -165,7 +165,7 @@
 
 - name: Test removal with url of present flatpak (check mode)
   flatpak:
-    name: https://flathub.org/repo/appstream/org.gnome.Calculator.flatpakref
+    name: file:///tmp/flatpak/repo/com.dummy.App8.flatpakref
     state: absent
   register: url_removal_present_result
   check_mode: true
@@ -178,8 +178,8 @@
 
 - name: Test non-existent idempotency of removal with url of present flatpak (check mode)
   flatpak:
-    name: https://flathub.org/repo/appstream/org.gnome.Calculator.flatpakref
-    remote: flathub
+    name: file:///tmp/flatpak/repo/com.dummy.App8.flatpakref
+    remote: dummy-remote
     state: absent
   register: double_url_removal_present_result
   check_mode: true
diff --git a/tests/integration/targets/flatpak/tasks/main.yml b/tests/integration/targets/flatpak/tasks/main.yml
index a1d1bda8a4..9f049bbe40 100644
--- a/tests/integration/targets/flatpak/tasks/main.yml
+++ b/tests/integration/targets/flatpak/tasks/main.yml
@@ -30,8 +30,8 @@
 
   - name: Test executable override
     flatpak:
-      name: org.gnome.Characters
-      remote: flathub
+      name: com.dummy.App1
+      remote: dummy-remote
       state: present
       executable: nothing-that-exists
     ignore_errors: true
@@ -58,4 +58,5 @@
       method: system
 
   when: |
-      ansible_distribution in ('Fedora', 'Ubuntu')
+      ansible_distribution == 'Fedora' or
+      ansible_distribution == 'Ubuntu' and not ansible_distribution_major_version | int < 16
diff --git a/tests/integration/targets/flatpak/tasks/setup.yml b/tests/integration/targets/flatpak/tasks/setup.yml
index 2dfa33a0b1..3a7665a5d6 100644
--- a/tests/integration/targets/flatpak/tasks/setup.yml
+++ b/tests/integration/targets/flatpak/tasks/setup.yml
@@ -4,32 +4,39 @@
     state: present
   become: true
   when: ansible_distribution == 'Fedora'
+
 - block:
   - name: Activate flatpak ppa on Ubuntu
     apt_repository:
       repo: ppa:alexlarsson/flatpak
       state: present
       mode: '0644'
+    when: ansible_lsb.major_release | int < 18
+
   - name: Install flatpak package on Ubuntu
     apt:
       name: flatpak
       state: present
-  become: true
+
   when: ansible_distribution == 'Ubuntu'
-- name: Enable flathub for user
+
+- name: Install dummy remote for user
   flatpak_remote:
-    name: flathub
+    name: dummy-remote
     state: present
-    flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
+    flatpakrepo_url: /tmp/flatpak/repo/dummy-repo.flatpakrepo
     method: user
-- name: Enable flathub for system
+
+- name: Install dummy remote for system
   flatpak_remote:
-    name: flathub
+    name: dummy-remote
     state: present
-    flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
+    flatpakrepo_url: /tmp/flatpak/repo/dummy-repo.flatpakrepo
     method: system
+
 - name: Add flatpak for testing check mode on present flatpak
   flatpak:
-    name: org.gnome.Calculator
-    remote: flathub
+    name: com.dummy.App8
+    remote: dummy-remote
+    no_dependencies: true
     state: present
diff --git a/tests/integration/targets/flatpak/tasks/test.yml b/tests/integration/targets/flatpak/tasks/test.yml
index 1e7d888bb5..706891e5ae 100644
--- a/tests/integration/targets/flatpak/tasks/test.yml
+++ b/tests/integration/targets/flatpak/tasks/test.yml
@@ -2,8 +2,8 @@
 
 - name: Test addition - {{ method }}
   flatpak:
-    name: org.gnome.Characters
-    remote: flathub
+    name: com.dummy.App1
+    remote: dummy-remote
     state: present
     method: "{{ method }}"
   register: addition_result
@@ -16,8 +16,8 @@
 
 - name: Test idempotency of addition - {{ method }}
   flatpak:
-    name: org.gnome.Characters
-    remote: flathub
+    name: com.dummy.App1
+    remote: dummy-remote
     state: present
     method: "{{ method }}"
   register: double_addition_result
@@ -32,7 +32,7 @@
 
 - name: Test removal - {{ method }}
   flatpak:
-    name: org.gnome.Characters
+    name: com.dummy.App1
     state: absent
     method: "{{ method }}"
   register: removal_result
@@ -45,7 +45,7 @@
 
 - name: Test idempotency of removal - {{ method }}
   flatpak:
-    name: org.gnome.Characters
+    name: com.dummy.App1
     state: absent
     method: "{{ method }}"
   register: double_removal_result
@@ -60,8 +60,8 @@
 
 - name: Test addition with url - {{ method }}
   flatpak:
-    name: https://flathub.org/repo/appstream/org.gnome.Characters.flatpakref
-    remote: flathub
+    name: file:///tmp/flatpak/repo/com.dummy.App1.flatpakref
+    remote: dummy-remote
     state: present
     method: "{{ method }}"
   register: url_addition_result
@@ -74,8 +74,8 @@
 
 - name: Test idempotency of addition with url - {{ method }}
   flatpak:
-    name: https://flathub.org/repo/appstream/org.gnome.Characters.flatpakref
-    remote: flathub
+    name: file:///tmp/flatpak/repo/com.dummy.App1.flatpakref
+    remote: dummy-remote
     state: present
     method: "{{ method }}"
   register: double_url_addition_result
@@ -90,7 +90,7 @@
 
 - name: Test removal with url - {{ method }}
   flatpak:
-    name: https://flathub.org/repo/appstream/org.gnome.Characters.flatpakref
+    name: file:///tmp/flatpak/repo/com.dummy.App1.flatpakref
     state: absent
     method: "{{ method }}"
   register: url_removal_result
@@ -103,7 +103,7 @@
 
 - name: Test idempotency of removal with url - {{ method }}
   flatpak:
-    name: https://flathub.org/repo/appstream/org.gnome.Characters.flatpakref
+    name: file:///tmp/flatpak/repo/com.dummy.App1.flatpakref
     state: absent
     method: "{{ method }}"
   register: double_url_removal_result