diff --git a/changelogs/fragments/361-drop-community.general-support-for-integration.tests.yml b/changelogs/fragments/361-drop-community.general-support-for-integration.tests.yml
new file mode 100644
index 00000000000..be7557ed5cf
--- /dev/null
+++ b/changelogs/fragments/361-drop-community.general-support-for-integration.tests.yml
@@ -0,0 +1,2 @@
+minor_changes:
+- integration tests - remove dependency with collection ``community.general`` (https://github.com/ansible-collections/amazon.aws/pull/361).
diff --git a/tests/integration/targets/ec2_eni/tasks/test_deletion.yaml b/tests/integration/targets/ec2_eni/tasks/test_deletion.yaml
index aecb625eb32..b6dffc3481e 100644
--- a/tests/integration/targets/ec2_eni/tasks/test_deletion.yaml
+++ b/tests/integration/targets/ec2_eni/tasks/test_deletion.yaml
@@ -16,7 +16,7 @@
       - result.changed
       - result.interface is undefined
       - '"network_interfaces" in eni_info'
-      - eni_id_1 not in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
+      - eni_id_1 not in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
 
 - name: test removing the network interface by ID is idempotent
   ec2_eni:
@@ -53,7 +53,7 @@
       - result.changed
       - result.interface is undefined
       - '"network_interfaces" in eni_info'
-      - eni_id_2 not in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
+      - eni_id_2 not in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
 
 - name: test removing the network interface by name is idempotent
   ec2_eni:
@@ -88,5 +88,5 @@
   assert:
     that:
       - '"network_interfaces" in eni_info'
-      - eni_id_1 not in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
-      - eni_id_2 not in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
+      - eni_id_1 not in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
+      - eni_id_2 not in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
diff --git a/tests/integration/targets/ec2_eni/tasks/test_eni_basic_creation.yaml b/tests/integration/targets/ec2_eni/tasks/test_eni_basic_creation.yaml
index b18af2dc9b3..b6f61c9365e 100644
--- a/tests/integration/targets/ec2_eni/tasks/test_eni_basic_creation.yaml
+++ b/tests/integration/targets/ec2_eni/tasks/test_eni_basic_creation.yaml
@@ -61,7 +61,7 @@
       - _interface_0.private_ip_address == ip_1
       - '"private_ip_addresses" in _interface_0'
       - _interface_0.private_ip_addresses | length == 1
-      - ip_1 in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
+      - ip_1 in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
       - '"requester_id" in _interface_0'
       - _interface_0.requester_id is string
       - '"requester_managed" in _interface_0'
@@ -156,7 +156,7 @@
       - _interface_0.private_ip_address == ip_5
       - '"private_ip_addresses" in _interface_0'
       - _interface_0.private_ip_addresses | length == 1
-      - ip_5 in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
+      - ip_5 in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
       - '"requester_id" in _interface_0'
       - _interface_0.requester_id is string
       - '"requester_managed" in _interface_0'
@@ -181,8 +181,8 @@
     that:
       - '"network_interfaces" in eni_info'
       - eni_info.network_interfaces | length >= 2
-      - eni_id_1 in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
-      - eni_id_2 in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
+      - eni_id_1 in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
+      - eni_id_2 in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
 
 # ============================================================
 # Run some VPC filter based tests of ec2_eni_info
@@ -199,8 +199,8 @@
     that:
       - '"network_interfaces" in eni_info'
       - eni_info.network_interfaces | length == 2
-      - eni_id_1 in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
-      - eni_id_2 in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
+      - eni_id_1 in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
+      - eni_id_2 in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
 
 - name: Fetch ENI info with VPC filters - VPC
   ec2_eni_info:
@@ -213,7 +213,7 @@
     that:
       - '"network_interfaces" in eni_info'
       - eni_info.network_interfaces | length == 4
-      - eni_id_1 in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
-      - eni_id_2 in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
-      - ec2_ips[0] in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
-      - ec2_ips[1] in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
+      - eni_id_1 in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
+      - eni_id_2 in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
+      - ec2_ips[0] in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
+      - ec2_ips[1] in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
diff --git a/tests/integration/targets/ec2_eni/tasks/test_ipaddress_assign.yaml b/tests/integration/targets/ec2_eni/tasks/test_ipaddress_assign.yaml
index a0a3696e9b5..1e67227cb4f 100644
--- a/tests/integration/targets/ec2_eni/tasks/test_ipaddress_assign.yaml
+++ b/tests/integration/targets/ec2_eni/tasks/test_ipaddress_assign.yaml
@@ -18,7 +18,7 @@
       - result.interface.id == eni_id_1
       - result.interface.private_ip_addresses | length == 3
       - _interface_0.private_ip_addresses | length == 3
-      - ip_1 in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
+      - ip_1 in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
   vars:
     _interface_0: '{{ eni_info.network_interfaces[0] }}'
 
@@ -40,7 +40,7 @@
       - result.interface.id == eni_id_1
       - result.interface.private_ip_addresses | length == 3
       - _interface_0.private_ip_addresses | length == 3
-      - ip_1 in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
+      - ip_1 in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
   vars:
     _interface_0: '{{ eni_info.network_interfaces[0] }}'
 
@@ -64,7 +64,7 @@
       - result.interface.id == eni_id_1
       - result.interface.private_ip_addresses | length == 3
       - _interface_0.private_ip_addresses | length == 3
-      - ip_1 in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
+      - ip_1 in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
   vars:
     _interface_0: '{{ eni_info.network_interfaces[0] }}'
 
@@ -106,7 +106,7 @@
       - new_secondary_ip in _private_ips
   vars:
     _interface_0: '{{ eni_info.network_interfaces[0] }}'
-    _private_ips: '{{ eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list }}'
+    _private_ips: "{{ eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list }}"
 
 # ============================================================
 - name: remove secondary address
@@ -128,7 +128,7 @@
       - result.interface.id == eni_id_1
       - result.interface.private_ip_addresses | length == 1
       - _interface_0.private_ip_addresses | length == 1
-      - ip_1 in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
+      - ip_1 in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
   vars:
     _interface_0: '{{ eni_info.network_interfaces[0] }}'
 
@@ -152,7 +152,7 @@
       - result.interface.private_ip_addresses | length == 1
       - result.interface.private_ip_addresses | length == 1
       - _interface_0.private_ip_addresses | length == 1
-      - ip_1 in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
+      - ip_1 in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
   vars:
     _interface_0: '{{ eni_info.network_interfaces[0] }}'
 
@@ -177,8 +177,8 @@
       - result.interface.id == eni_id_2
       - result.interface.private_ip_addresses | length == 2
       - _interface_0.private_ip_addresses | length == 2
-      - ip_5 in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
-      - ip_4 in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
+      - ip_5 in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
+      - ip_4 in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
   vars:
     _interface_0: '{{ eni_info.network_interfaces[0] }}'
 
@@ -262,6 +262,6 @@
     that:
       - result.changed
       - _interface_0.private_ip_addresses | length == 1
-      - ip_1 in ( eni_info | community.general.json_query("network_interfaces[].private_ip_addresses[].private_ip_address") | list )
+      - ip_1 in ( eni_info.network_interfaces | map(attribute='private_ip_addresses') | flatten | map(attribute='private_ip_address') | list )
   vars:
     _interface_0: '{{ eni_info.network_interfaces[0] }}'
diff --git a/tests/integration/targets/ec2_eni/tasks/test_modifying_delete_on_termination.yaml b/tests/integration/targets/ec2_eni/tasks/test_modifying_delete_on_termination.yaml
index 8e8bd0596d4..54240b4d2a2 100644
--- a/tests/integration/targets/ec2_eni/tasks/test_modifying_delete_on_termination.yaml
+++ b/tests/integration/targets/ec2_eni/tasks/test_modifying_delete_on_termination.yaml
@@ -149,8 +149,8 @@
       - not result.changed
       - '"network_interfaces" in eni_info'
       - eni_info.network_interfaces | length >= 1
-      - eni_id_1 not in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
-      - eni_id_2 in ( eni_info | community.general.json_query("network_interfaces[].id") | list )
+      - eni_id_1 not in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
+      - eni_id_2 in ( eni_info.network_interfaces | selectattr('id') | map(attribute='id') | list )
 
 # ============================================================
 
diff --git a/tests/integration/targets/ec2_snapshot/tasks/main.yml b/tests/integration/targets/ec2_snapshot/tasks/main.yml
index fd00216bc92..94a4c9ab20d 100644
--- a/tests/integration/targets/ec2_snapshot/tasks/main.yml
+++ b/tests/integration/targets/ec2_snapshot/tasks/main.yml
@@ -165,7 +165,7 @@
         that:
           - result is changed
           - info_result.snapshots| length == 2
-          - '"{{ result.snapshot_id }}" in "{{ info_result| community.general.json_query("snapshots[].snapshot_id") }}"'
+          - result.snapshot_id in ( info_result.snapshots | map(attribute='snapshot_id') | list )
 
 #    JR: Check mode not supported
 #    - name: Take snapshot with a tag (check mode)
@@ -296,7 +296,7 @@
     - assert:
         that:
           - info_result.snapshots| length == 7
-          - '"{{ tagged_snapshot_id }}" not in "{{ info_result| community.general.json_query("snapshots[].snapshot_id") }}"'
+          - tagged_snapshot_id not in ( info_result.snapshots | map(attribute='snapshot_id') | list )
 
     - name: Delete snapshots
       ec2_snapshot:
diff --git a/tests/integration/targets/ec2_vpc_dhcp_option/tasks/main.yml b/tests/integration/targets/ec2_vpc_dhcp_option/tasks/main.yml
index ee780170387..5441e4f7f9b 100644
--- a/tests/integration/targets/ec2_vpc_dhcp_option/tasks/main.yml
+++ b/tests/integration/targets/ec2_vpc_dhcp_option/tasks/main.yml
@@ -14,9 +14,6 @@
       security_token: "{{ security_token | default('') }}"
       region: "{{ aws_region }}"
 
-  collections:
-    - community.general
-
   block:
 
   # DHCP option set can be attached to multiple VPCs, we don't want to use any that
@@ -26,7 +23,7 @@
     register: result
 
   - set_fact:
-      preexisting_option_sets: "{{ result | community.general.json_query('dhcp_options[*].dhcp_options_id') | list }}"
+      preexisting_option_sets: "{{ result.dhcp_options | map(attribute='dhcp_options_id') | list }}"
 
   - name: create a VPC with a default DHCP option set to test inheritance and delete_old
     ec2_vpc_net:
@@ -183,8 +180,8 @@
         - dhcp_options.new_options['domain-name'] == ['{{ aws_domain_name }}']
         - dhcp_options.new_options['domain-name-servers'] == ['AmazonProvidedDNS']
         # We return the list of dicts that boto gives us, in addition to the user-friendly config dict
-        - dhcp_options_config['ntp-servers'] | community.general.json_query('[*].value') | list | sort == ['10.0.0.2', '10.0.1.2']
-        - dhcp_options_config['netbios-name-servers'] | community.general.json_query('[*].value') | list | sort == ['10.0.0.1', '10.0.1.1']
+        - dhcp_options_config['ntp-servers'] | map(attribute='value') | list | sort == ['10.0.0.2', '10.0.1.2']
+        - dhcp_options_config['netbios-name-servers'] | map(attribute='value') | list | sort == ['10.0.0.1', '10.0.1.1']
         - dhcp_options_config['netbios-node-type'][0]['value'] == '2'
         - dhcp_options_config['domain-name'][0]['value'] == '{{ aws_domain_name }}'
         - dhcp_options_config['domain-name-servers'][0]['value'] == 'AmazonProvidedDNS'
@@ -206,8 +203,8 @@
         - new_config.keys() | list | sort == ['domain-name', 'domain-name-servers', 'netbios-name-servers', 'netbios-node-type', 'ntp-servers']
         - new_config['domain-name'][0]['value'] == '{{ aws_domain_name }}'
         - new_config['domain-name-servers'][0]['value'] == 'AmazonProvidedDNS'
-        - new_config['ntp-servers'] | community.general.json_query('[*].value') | list | sort == ['10.0.0.2', '10.0.1.2']
-        - new_config['netbios-name-servers'] | community.general.json_query('[*].value') | list | sort == ['10.0.0.1', '10.0.1.1']
+        - new_config['ntp-servers'] | map(attribute='value') | list | sort == ['10.0.0.2', '10.0.1.2']
+        - new_config['netbios-name-servers'] | map(attribute='value') | list | sort == ['10.0.0.1', '10.0.1.1']
         - new_config['netbios-node-type'][0]['value'] == '2'
         # We return the list of dicts that boto gives us, in addition to the user-friendly config dict
         - new_dhcp_options.dhcp_config[0]['ntp-servers'] | sort == ['10.0.0.2', '10.0.1.2']
@@ -305,8 +302,8 @@
   - assert:
       that:
         - new_config.keys() | list | sort == ['netbios-name-servers', 'netbios-node-type', 'ntp-servers']
-        - new_config['ntp-servers'] | community.general.json_query('[*].value') | list | sort == ['10.0.0.2', '10.0.1.2']
-        - new_config['netbios-name-servers'] | community.general.json_query('[*].value') | list | sort == ['10.0.0.1', '10.0.1.1']
+        - new_config['ntp-servers'] | map(attribute='value') | list | sort == ['10.0.0.2', '10.0.1.2']
+        - new_config['netbios-name-servers'] | map(attribute='value') | list | sort == ['10.0.0.1', '10.0.1.1']
         - new_config['netbios-node-type'][0]['value'] == '2'
 
   - name: disassociate the new DHCP option set so it can be deleted
@@ -384,8 +381,8 @@
       that:
         - new_config.keys() | list | sort == ['domain-name', 'domain-name-servers', 'netbios-name-servers', 'netbios-node-type', 'ntp-servers']
         - new_config['domain-name'][0]['value'] == '{{ aws_domain_name }}'
-        - new_config['ntp-servers'] | community.general.json_query('[*].value') | list | sort == ['10.0.0.2', '10.0.1.2']
-        - new_config['netbios-name-servers'] | community.general.json_query('[*].value') | list | sort == ['10.0.0.1', '10.0.1.1']
+        - new_config['ntp-servers'] | map(attribute='value') | list | sort == ['10.0.0.2', '10.0.1.2']
+        - new_config['netbios-name-servers'] | map(attribute='value') | list | sort == ['10.0.0.1', '10.0.1.1']
         - new_config['netbios-node-type'][0]['value'] == '1'
 
   - name: verify the original set was deleted
@@ -533,8 +530,8 @@
         - dhcp_options.new_options['netbios-name-servers'] | sort == ['10.0.0.1', '10.0.1.1']
         - original_dhcp_options_id != dhcp_options.dhcp_options_id
         # We return the list of dicts that boto gives us, in addition to the user-friendly config dict
-        - dhcp_options_config['ntp-servers'] | community.general.json_query('[*].value') | list | sort == ['10.0.0.2', '10.0.1.2']
-        - dhcp_options_config['netbios-name-servers'] | community.general.json_query('[*].value') | list | sort == ['10.0.0.1', '10.0.1.1']
+        - dhcp_options_config['ntp-servers'] | map(attribute='value') | list | sort == ['10.0.0.2', '10.0.1.2']
+        - dhcp_options_config['netbios-name-servers'] | map(attribute='value') | list | sort == ['10.0.0.1', '10.0.1.1']
         - dhcp_options.dhcp_options.tags.keys() | length == 2
         - dhcp_options.dhcp_options.tags['CreatedBy'] == 'ansible-test'
         - dhcp_options.dhcp_options.tags['Collection'] == 'amazon.aws'
diff --git a/tests/integration/targets/ec2_vpc_net/tasks/main.yml b/tests/integration/targets/ec2_vpc_net/tasks/main.yml
index 728667ac32e..19fcd65ae65 100644
--- a/tests/integration/targets/ec2_vpc_net/tasks/main.yml
+++ b/tests/integration/targets/ec2_vpc_net/tasks/main.yml
@@ -174,7 +174,7 @@
     - name: Test that our new VPC shows up in the results
       assert:
         that:
-          - vpc_1 in ( vpc_info | community.general.json_query("vpcs[].vpc_id") | list )
+          - vpc_1 in ( vpc_info.vpcs | map(attribute="vpc_id") | list )
 
     - name: VPC info (Simple tag filter)
       ec2_vpc_net_info:
@@ -789,17 +789,17 @@
     #      - result.vpc.id == vpc_1
     #      - vpc_info.vpcs | length == 1
     #      - vpc_info.vpcs[0].cidr_block == vpc_cidr
-    #      - vpc_cidr in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-    #      - vpc_cidr_a not in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-    #      - vpc_cidr_b not in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+    #      - vpc_cidr in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+    #      - vpc_cidr_a not in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+    #      - vpc_cidr_b not in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
     #      - vpc_info.vpcs[0].cidr_block_association_set | length == 1
     #      - vpc_info.vpcs[0].cidr_block_association_set[0].association_id.startswith("vpc-cidr-assoc-")
     #      - vpc_info.vpcs[0].cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
     #      - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
     #      - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
-    #      - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-    #      - vpc_cidr_a not in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-    #      - vpc_cidr_b not in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+    #      - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+    #      - vpc_cidr_a not in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+    #      - vpc_cidr_b not in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
 
     - name: modify CIDR
       ec2_vpc_net:
@@ -828,17 +828,17 @@
           - result.vpc.cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
           - result.vpc.cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b not in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b not in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
           - vpc_info.vpcs[0].cidr_block_association_set | length == 2
           - vpc_info.vpcs[0].cidr_block_association_set[0].association_id.startswith("vpc-cidr-assoc-")
           - vpc_info.vpcs[0].cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
           - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b not in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b not in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
 
     - name: modify CIDR (no change)
       ec2_vpc_net:
@@ -867,17 +867,17 @@
           - result.vpc.cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
           - result.vpc.cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b not in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b not in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
           - vpc_info.vpcs[0].cidr_block_association_set | length == 2
           - vpc_info.vpcs[0].cidr_block_association_set[0].association_id.startswith("vpc-cidr-assoc-")
           - vpc_info.vpcs[0].cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
           - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b not in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b not in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
 
     # #62678
     #- name: modify CIDR - no purge (check mode)
@@ -901,17 +901,17 @@
     #      - result is changed
     #      - vpc_info.vpcs | length == 1
     #      - vpc_info.vpcs[0].cidr_block == vpc_cidr
-    #      - vpc_cidr in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-    #      - vpc_cidr_a in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-    #      - vpc_cidr_b not in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+    #      - vpc_cidr in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+    #      - vpc_cidr_a in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+    #      - vpc_cidr_b not in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
     #      - vpc_info.vpcs[0].cidr_block_association_set | length == 2
     #      - vpc_info.vpcs[0].cidr_block_association_set[0].association_id.startswith("vpc-cidr-assoc-")
     #      - vpc_info.vpcs[0].cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
     #      - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
     #      - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
-    #      - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-    #      - vpc_cidr_a in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-    #      - vpc_cidr_b not in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+    #      - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+    #      - vpc_cidr_a in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+    #      - vpc_cidr_b not in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
 
     - name: modify CIDR - no purge
       ec2_vpc_net:
@@ -942,9 +942,9 @@
           - result.vpc.cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
           - vpc_info.vpcs[0].cidr_block_association_set | length == 3
           - vpc_info.vpcs[0].cidr_block_association_set[0].association_id.startswith("vpc-cidr-assoc-")
           - vpc_info.vpcs[0].cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
@@ -952,9 +952,9 @@
           - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
 
     - name: modify CIDR - no purge (no change)
       ec2_vpc_net:
@@ -984,9 +984,9 @@
           - result.vpc.cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
           - vpc_info.vpcs[0].cidr_block_association_set | length == 3
           - vpc_info.vpcs[0].cidr_block_association_set[0].association_id.startswith("vpc-cidr-assoc-")
           - vpc_info.vpcs[0].cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
@@ -994,9 +994,9 @@
           - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
 
     - name: modify CIDR - no purge (no change - list all - check mode)
       ec2_vpc_net:
@@ -1027,9 +1027,9 @@
           - result.vpc.cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
           - vpc_info.vpcs[0].cidr_block_association_set | length == 3
           - vpc_info.vpcs[0].cidr_block_association_set[0].association_id.startswith("vpc-cidr-assoc-")
           - vpc_info.vpcs[0].cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
@@ -1037,9 +1037,9 @@
           - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
 
     - name: modify CIDR - no purge (no change - list all)
       ec2_vpc_net:
@@ -1070,9 +1070,9 @@
           - result.vpc.cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
           - vpc_info.vpcs[0].cidr_block_association_set | length == 3
           - vpc_info.vpcs[0].cidr_block_association_set[0].association_id.startswith("vpc-cidr-assoc-")
           - vpc_info.vpcs[0].cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
@@ -1080,9 +1080,9 @@
           - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
 
     - name: modify CIDR - no purge (no change - different order - check mode)
       ec2_vpc_net:
@@ -1113,9 +1113,9 @@
           - result.vpc.cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
           - vpc_info.vpcs[0].cidr_block_association_set | length == 3
           - vpc_info.vpcs[0].cidr_block_association_set[0].association_id.startswith("vpc-cidr-assoc-")
           - vpc_info.vpcs[0].cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
@@ -1123,9 +1123,9 @@
           - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
 
     - name: modify CIDR - no purge (no change - different order)
       ec2_vpc_net:
@@ -1156,9 +1156,9 @@
           - result.vpc.cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - result.vpc.cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (result.vpc | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (result.vpc.cidr_block_association_set | map(attribute="cidr_block") | list)
           - vpc_info.vpcs[0].cidr_block_association_set | length == 3
           - vpc_info.vpcs[0].cidr_block_association_set[0].association_id.startswith("vpc-cidr-assoc-")
           - vpc_info.vpcs[0].cidr_block_association_set[1].association_id.startswith("vpc-cidr-assoc-")
@@ -1166,9 +1166,9 @@
           - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
           - vpc_info.vpcs[0].cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-          - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_a in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-          - vpc_cidr_b in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+          - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_a in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+          - vpc_cidr_b in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
 
     # #62678
     #- name: modify CIDR - purge (check mode)
@@ -1200,9 +1200,9 @@
     #      - vpc_info.vpcs[0].cidr_block_association_set[0].cidr_block_state.state in ["associated", "associating"]
     #      - vpc_info.vpcs[0].cidr_block_association_set[1].cidr_block_state.state in ["associated", "associating"]
     #      - vpc_info.vpcs[0].cidr_block_association_set[2].cidr_block_state.state in ["associated", "associating"]
-    #      - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-    #      - vpc_cidr_a in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
-    #      - vpc_cidr_b in (vpc_info.vpcs[0] | community.general.json_query("cidr_block_association_set[*].cidr_block") | list)
+    #      - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+    #      - vpc_cidr_a in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
+    #      - vpc_cidr_b in (vpc_info.vpcs[0].cidr_block_association_set | map(attribute="cidr_block") | list)
 
     - name: modify CIDR - purge
       ec2_vpc_net:
@@ -1219,8 +1219,6 @@
       register: vpc_info
 
     - name: assert the CIDRs changed
-      vars:
-        cidr_query: 'cidr_block_association_set[?cidr_block_state.state == `associated`].cidr_block'
       assert:
         that:
           - result is successful
@@ -1229,14 +1227,14 @@
           - vpc_info.vpcs | length == 1
           - result.vpc.cidr_block == vpc_cidr
           - vpc_info.vpcs[0].cidr_block == vpc_cidr
-          - result.vpc | community.general.json_query(cidr_query) | list | length == 2
-          - vpc_cidr in (result.vpc | community.general.json_query(cidr_query) | list)
-          - vpc_cidr_a not in (result.vpc | community.general.json_query(cidr_query) | list)
-          - vpc_cidr_b in (result.vpc | community.general.json_query(cidr_query) | list)
-          - vpc_info.vpcs[0] | community.general.json_query(cidr_query) | list | length == 2
-          - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query(cidr_query) | list)
-          - vpc_cidr_a not in (vpc_info.vpcs[0] | community.general.json_query(cidr_query) | list)
-          - vpc_cidr_b in (vpc_info.vpcs[0] | community.general.json_query(cidr_query) | list)
+          - result.vpc.cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list | length == 2
+          - vpc_cidr in (result.vpc.cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list)
+          - vpc_cidr_a not in (result.vpc.cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block'))
+          - vpc_cidr_b in (result.vpc.cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block'))
+          - vpc_info.vpcs[0].cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list | length == 2
+          - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list)
+          - vpc_cidr_a not in (vpc_info.vpcs[0].cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list)
+          - vpc_cidr_b in (vpc_info.vpcs[0].cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list)
 
     - name: modify CIDR - purge (no change)
       ec2_vpc_net:
@@ -1253,8 +1251,6 @@
       register: vpc_info
 
     - name: assert the CIDRs didn't change
-      vars:
-        cidr_query: 'cidr_block_association_set[?cidr_block_state.state == `associated`].cidr_block'
       assert:
         that:
           - result is successful
@@ -1263,14 +1259,14 @@
           - vpc_info.vpcs | length == 1
           - result.vpc.cidr_block == vpc_cidr
           - vpc_info.vpcs[0].cidr_block == vpc_cidr
-          - result.vpc | community.general.json_query(cidr_query) | list | length == 2
-          - vpc_cidr in (result.vpc | community.general.json_query(cidr_query) | list)
-          - vpc_cidr_a not in (result.vpc | community.general.json_query(cidr_query) | list)
-          - vpc_cidr_b in (result.vpc | community.general.json_query(cidr_query) | list)
-          - vpc_info.vpcs[0] | community.general.json_query(cidr_query) | list | length == 2
-          - vpc_cidr in (vpc_info.vpcs[0] | community.general.json_query(cidr_query) | list)
-          - vpc_cidr_a not in (vpc_info.vpcs[0] | community.general.json_query(cidr_query) | list)
-          - vpc_cidr_b in (vpc_info.vpcs[0] | community.general.json_query(cidr_query) | list)
+          - result.vpc.cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list | length == 2
+          - vpc_cidr in (result.vpc.cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list)
+          - vpc_cidr_a not in (result.vpc.cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list)
+          - vpc_cidr_b in (result.vpc.cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list)
+          - vpc_info.vpcs[0].cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list | length == 2
+          - vpc_cidr in (vpc_info.vpcs[0].cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list)
+          - vpc_cidr_a not in (vpc_info.vpcs[0].cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list)
+          - vpc_cidr_b in (vpc_info.vpcs[0].cidr_block_association_set | selectattr('cidr_block_state.state', 'equalto', 'associated') | map(attribute='cidr_block') | list)
 
     # ============================================================
 
diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/populate_cache.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/populate_cache.yml
index 64e8da4c749..1308fab93a7 100644
--- a/tests/integration/targets/inventory_aws_ec2/playbooks/populate_cache.yml
+++ b/tests/integration/targets/inventory_aws_ec2/playbooks/populate_cache.yml
@@ -3,8 +3,6 @@
   connection: local
   gather_facts: no
   environment: "{{ ansible_test.environment }}"
-  collections:
-    - community.general
   tasks:
 
     - module_defaults:
diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_constructed.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_constructed.yml.j2
index c0ebcbfcb47..a33f03e21c7 100644
--- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_constructed.yml.j2
+++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_constructed.yml.j2
@@ -10,7 +10,7 @@ filters:
   tag:Name:
   - '{{ resource_prefix }}'
 keyed_groups:
-- key: 'security_groups|community.general.json_query("[].group_id")'
+- key: 'security_groups|map(attribute="group_id")'
   prefix: security_groups
 - key: tags
   prefix: tag
diff --git a/tests/integration/targets/inventory_aws_rds/templates/inventory_with_constructed.j2 b/tests/integration/targets/inventory_aws_rds/templates/inventory_with_constructed.j2
index a0636a971bd..c5603ef874a 100644
--- a/tests/integration/targets/inventory_aws_rds/templates/inventory_with_constructed.j2
+++ b/tests/integration/targets/inventory_aws_rds/templates/inventory_with_constructed.j2
@@ -7,7 +7,7 @@ aws_security_token: '{{ security_token }}'
 regions:
   - '{{ aws_region }}'
 keyed_groups:
-  - key: 'db_parameter_groups|community.general.json_query("[].db_parameter_group_name")'
+  - key: 'db_parameter_groups|map(attribute="db_parameter_group_name")'
     prefix: rds_parameter_group
   - key: tags
     prefix: tag
diff --git a/tests/requirements.yml b/tests/requirements.yml
index 63120f9b2af..77938b9e2dc 100644
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -1,5 +1,4 @@
 integration_tests_dependencies:
 - ansible.windows
-- community.general
 - ansible.netcommon  # ipv6 filter
 unit_tests_dependencies: []