diff --git a/test/ejabberd_SUITE_data/ejabberd.mnesia.yml b/test/ejabberd_SUITE_data/ejabberd.mnesia.yml
index 70975123c..bb57d0858 100644
--- a/test/ejabberd_SUITE_data/ejabberd.mnesia.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.mnesia.yml
@@ -13,6 +13,7 @@ define_macro:
         db_type: internal
       mod_muc:
         db_type: internal
+        vcard: VCARD
       mod_offline:
         db_type: internal
       mod_privacy:
@@ -26,6 +27,7 @@ define_macro:
         plugins:
           - "flat"
           - "pep"
+        vcard: VCARD
       mod_roster:
         versioning: true
         store_current_id: true
@@ -34,6 +36,7 @@ define_macro:
         db_type: internal
       mod_vcard:
         db_type: internal
+        vcard: VCARD
       mod_vcard_xupdate: []
       mod_client_state:
         queue_presence: true
diff --git a/test/ejabberd_SUITE_data/ejabberd.mysql.yml b/test/ejabberd_SUITE_data/ejabberd.mysql.yml
index 0b0550e18..eb81c6c30 100644
--- a/test/ejabberd_SUITE_data/ejabberd.mysql.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.mysql.yml
@@ -21,6 +21,7 @@ define_macro:
       mod_muc:
         db_type: sql
         ram_db_type: sql
+        vcard: VCARD
       mod_offline:
         use_cache: true
         db_type: sql
@@ -36,6 +37,7 @@ define_macro:
         plugins:
           - "flat"
           - "pep"
+        vcard: VCARD
       mod_roster:
         versioning: true
         store_current_id: true
@@ -44,6 +46,7 @@ define_macro:
         db_type: sql
       mod_vcard:
         db_type: sql
+        vcard: VCARD
       mod_vcard_xupdate: []
       mod_adhoc: []
       mod_configure: []
diff --git a/test/ejabberd_SUITE_data/ejabberd.pgsql.yml b/test/ejabberd_SUITE_data/ejabberd.pgsql.yml
index 637fc61bc..d7d43c9c4 100644
--- a/test/ejabberd_SUITE_data/ejabberd.pgsql.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.pgsql.yml
@@ -21,6 +21,7 @@ define_macro:
       mod_muc:
         db_type: sql
         ram_db_type: sql
+        vcard: VCARD
       mod_offline:
         use_cache: true
         db_type: sql
@@ -36,6 +37,7 @@ define_macro:
         plugins:
           - "flat"
           - "pep"
+        vcard: VCARD
       mod_roster:
         versioning: true
         store_current_id: true
@@ -44,6 +46,7 @@ define_macro:
         db_type: sql
       mod_vcard:
         db_type: sql
+        vcard: VCARD
       mod_vcard_xupdate: []
       mod_adhoc: []
       mod_configure: []
diff --git a/test/ejabberd_SUITE_data/ejabberd.redis.yml b/test/ejabberd_SUITE_data/ejabberd.redis.yml
index 1c0ac6de7..5988c5b4d 100644
--- a/test/ejabberd_SUITE_data/ejabberd.redis.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.redis.yml
@@ -14,6 +14,7 @@ define_macro:
         db_type: internal
       mod_muc:
         db_type: internal
+        vcard: VCARD
       mod_offline:
         db_type: internal
       mod_privacy:
@@ -27,6 +28,7 @@ define_macro:
         plugins:
           - "flat"
           - "pep"
+        vcard: VCARD
       mod_roster:
         versioning: true
         store_current_id: true
@@ -35,6 +37,7 @@ define_macro:
         db_type: internal
       mod_vcard:
         db_type: internal
+        vcard: VCARD
       mod_vcard_xupdate: []
       mod_client_state:
         queue_presence: true
diff --git a/test/ejabberd_SUITE_data/ejabberd.sqlite.yml b/test/ejabberd_SUITE_data/ejabberd.sqlite.yml
index b0bfdb473..9efaf216e 100644
--- a/test/ejabberd_SUITE_data/ejabberd.sqlite.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.sqlite.yml
@@ -16,6 +16,7 @@ define_macro:
       mod_muc:
         db_type: sql
         ram_db_type: sql
+        vcard: VCARD
       mod_offline:
         db_type: sql
       mod_privacy:
@@ -30,6 +31,7 @@ define_macro:
         plugins:
           - "flat"
           - "pep"
+        vcard: VCARD
       mod_roster:
         versioning: true
         store_current_id: true
@@ -38,6 +40,7 @@ define_macro:
         db_type: sql
       mod_vcard:
         db_type: sql
+        vcard: VCARD
       mod_vcard_xupdate: []
       mod_adhoc: []
       mod_configure: []
diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml
index d642832dd..93c540b83 100644
--- a/test/ejabberd_SUITE_data/ejabberd.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.yml
@@ -100,8 +100,10 @@ modules:
   mod_configure: []
   mod_disco: []
   mod_ping: []
-  mod_proxy65: []
-  mod_muc: []
+  mod_proxy65:
+    vcard: VCARD
+  mod_muc:
+    vcard: VCARD
   mod_muc_admin: []
   mod_carboncopy: []
   mod_mam: []
@@ -124,6 +126,7 @@ Welcome to this XMPP server."
     put_url: PUT_URL
     get_url: GET_URL
     max_size: 10000
+    vcard: VCARD
 registration_timeout: infinity
 route_subdomains: s2s
 s2s_use_starttls: false
diff --git a/test/ejabberd_SUITE_data/macros.yml b/test/ejabberd_SUITE_data/macros.yml
index 9ba6a561b..047d363eb 100644
--- a/test/ejabberd_SUITE_data/macros.yml
+++ b/test/ejabberd_SUITE_data/macros.yml
@@ -22,3 +22,106 @@ define_macro:
   PGSQL_PORT: @@pgsql_port@@
   PGSQL_PASS: "@@pgsql_pass@@"
   PGSQL_DB: "@@pgsql_db@@"
+  VCARD:
+    version: "1.0"
+    fn: Full Name
+    n:
+      family: Family
+      given: Given
+      middle: Middle
+      prefix: Prefix
+      suffix: Suffix
+    nickname: Nickname
+    photo:
+      type: image/png
+      extval: https://domain.tld/photo.png
+      binval: >-
+        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQAAAAA3bvkkAA
+        AACklEQVR4AWNoAAAAggCBTBfX3wAAAABJRU5ErkJggg==
+    bday: 2000-01-01
+    adr:
+      -
+        home: true
+        work: true
+        postal: true
+        parcel: true
+        dom: true
+        intl: true
+        pref: true
+        pobox: Pobox
+        extadd: Extadd
+        street: Street
+        locality: Locality
+        region: Region
+        pcode: Pcode
+        ctry: Ctry
+    label:
+      -
+        home: true
+        work: true
+        postal: true
+        parcel: true
+        dom: true
+        intl: true
+        pref: true
+        line:
+          - Line1
+          - Line2
+    tel:
+      -
+        home: true
+        work: true
+        voice: true
+        fax: true
+        pager: true
+        msg: true
+        cell: true
+        video: true
+        bbs: true
+        modem: true
+        isdn: true
+        pcs: true
+        pref: true
+        number: +7-900-01-02
+    email:
+      -
+        home: true
+        work: true
+        internet: true
+        pref: true
+        x400: true
+        userid: user@domain.tld
+    jabberid: user@domain.tld
+    mailer: Mailer
+    tz: TZ
+    geo:
+      lat: "12.0"
+      lon: "21.0"
+    title: Title
+    role: Role
+    logo:
+      type: image/png
+      extval: https://domain.tld/logo.png
+      binval: >-
+        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQAAAAA3bvkkAA
+        AACklEQVR4AWNoAAAAggCBTBfX3wAAAABJRU5ErkJggg==
+    categories:
+      - Cat1
+      - Cat2
+    note: Note
+    prodid: ProdID
+    rev: Rev
+    sort_string: SortString
+    sound:
+      phonetic: Phonetic
+      extval: https://domain.tld/sound.ogg
+      binval: >-
+        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQAAAAA3bvkkAA
+        AACklEQVR4AWNoAAAAggCBTBfX3wAAAABJRU5ErkJggg==
+    uid: UID
+    url: https://domain.tld
+    class: public
+    key:
+      type: Type
+      cred: Cred
+    desc: Desc
diff --git a/test/muc_tests.erl b/test/muc_tests.erl
index 028386d6b..1d586431b 100644
--- a/test/muc_tests.erl
+++ b/test/muc_tests.erl
@@ -193,7 +193,8 @@ service_disco_items(Config) ->
 service_vcard(Config) ->
     MUC = muc_jid(Config),
     ct:comment("Retreiving vCard from ~s", [jid:encode(MUC)]),
-    #iq{type = result, sub_els = [#vcard_temp{}]} =
+    VCard = mod_muc_opt:vcard(?config(server, Config)),
+    #iq{type = result, sub_els = [VCard]} =
 	send_recv(Config, #iq{type = get, to = MUC, sub_els = [#vcard_temp{}]}),
     disconnect(Config).
 
diff --git a/test/proxy65_tests.erl b/test/proxy65_tests.erl
index be3c92cd4..7685952d9 100644
--- a/test/proxy65_tests.erl
+++ b/test/proxy65_tests.erl
@@ -49,7 +49,8 @@ feature_enabled(Config) ->
 service_vcard(Config) ->
     JID = proxy_jid(Config),
     ct:comment("Retreiving vCard from ~s", [jid:encode(JID)]),
-    #iq{type = result, sub_els = [#vcard_temp{}]} =
+    VCard = mod_proxy65_opt:vcard(?config(server, Config)),
+    #iq{type = result, sub_els = [VCard]} =
 	send_recv(Config, #iq{type = get, to = JID, sub_els = [#vcard_temp{}]}),
     disconnect(Config).
 
diff --git a/test/pubsub_tests.erl b/test/pubsub_tests.erl
index 3552f7263..ac64185ff 100644
--- a/test/pubsub_tests.erl
+++ b/test/pubsub_tests.erl
@@ -87,7 +87,8 @@ test_features(Config) ->
 test_vcard(Config) ->
     JID = pubsub_jid(Config),
     ct:comment("Retreiving vCard from ~s", [jid:encode(JID)]),
-    #iq{type = result, sub_els = [#vcard_temp{}]} =
+    VCard = mod_pubsub_opt:vcard(?config(server, Config)),
+    #iq{type = result, sub_els = [VCard]} =
 	send_recv(Config, #iq{type = get, to = JID, sub_els = [#vcard_temp{}]}),
     disconnect(Config).
 
diff --git a/test/upload_tests.erl b/test/upload_tests.erl
index 0234a8847..9d4b86d6a 100644
--- a/test/upload_tests.erl
+++ b/test/upload_tests.erl
@@ -40,6 +40,7 @@
 single_cases() ->
     {upload_single, [sequence],
      [single_test(feature_enabled),
+      single_test(service_vcard),
       single_test(get_max_size),
       single_test(slot_request),
       single_test(put_get_request),
@@ -52,6 +53,14 @@ feature_enabled(Config) ->
       end, namespaces()),
     disconnect(Config).
 
+service_vcard(Config) ->
+    Upload = upload_jid(Config),
+    ct:comment("Retreiving vCard from ~s", [jid:encode(Upload)]),
+    VCard = mod_http_upload_opt:vcard(?config(server, Config)),
+    #iq{type = result, sub_els = [VCard]} =
+	send_recv(Config, #iq{type = get, to = Upload, sub_els = [#vcard_temp{}]}),
+    disconnect(Config).
+
 get_max_size(Config) ->
     Xs = get_disco_info_xdata(Config),
     lists:foreach(
diff --git a/test/vcard_tests.erl b/test/vcard_tests.erl
index 0ee2e5459..530429590 100644
--- a/test/vcard_tests.erl
+++ b/test/vcard_tests.erl
@@ -91,7 +91,8 @@ get_set(Config) ->
 service_vcard(Config) ->
     JID = server_jid(Config),
     ct:comment("Retreiving vCard from ~s", [jid:encode(JID)]),
-    #iq{type = result, sub_els = [#vcard_temp{}]} =
+    VCard = mod_vcard_opt:vcard(?config(server, Config)),
+    #iq{type = result, sub_els = [VCard]} =
 	send_recv(Config, #iq{type = get, to = JID, sub_els = [#vcard_temp{}]}),
     disconnect(Config).