diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite/FuncSingleFileFtp.robot
similarity index 94%
rename from tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
rename to tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite/FuncSingleFileFtp.robot
index 8213c70..7d8afbb 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite/FuncSingleFileFtp.robot
@@ -95,10 +95,15 @@
     Set Environment Variable        MR_FILE_PREFIX_MAPPING  PM_MEAS_FILES:A
     Set Environment Variable        DR_REDIR_FEEDS          2:A
     Set Environment Variable        FTP_FILE_PREFIXES       A
+    Set Environment Variable        HTTP_FILE_PREFIXES      A
+    Set Environment Variable        HTTP_TYPE               HTTP
     Set Environment Variable        NUM_FTPFILES            1
+    Set Environment Variable        NUM_HTTPFILES           1
     Set Environment Variable        NUM_PNFS                1
     Set Environment Variable        NUM_FTP_SERVERS         1
+    Set Environment Variable        NUM_HTTP_SERVERS        1
     Set Environment Variable        DR_FEEDS                2:A
     Set Environment Variable        DR_REDIR_SIM            drsim_redir
     Set Environment Variable        SFTP_SIMS               sftp-server0:22
     Set Environment Variable        FTPES_SIMS              ftpes-server-vsftpd0:21
+    Set Environment Variable        HTTP_SIMS               http-server0:80
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/__init__.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite/__init__.robot
similarity index 68%
copy from tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/__init__.robot
copy to tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite/__init__.robot
index dc2d837..d99ffc3 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/__init__.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite/__init__.robot
@@ -1,2 +1,2 @@
 *** Settings ***
-Documentation    DFC Functional test suite. Single event with single file.
+Documentation    DFC Functional test suite. Single event with single file - FTPES and SFTP protocols.
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite/FuncSingleFileHttp.robot
similarity index 73%
copy from tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
copy to tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite/FuncSingleFileHttp.robot
index 8213c70..e37a910 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite/FuncSingleFileHttp.robot
@@ -12,50 +12,34 @@
 
 *** Test Cases ***
 
-######### Single file, SFTP
+######## Single file, HTTP
 
-Verify single event with single 1MB SFTP file. From event poll to published file
-    [TAGS]                          DFC_FUNCTIONAL_1
-    [Documentation]                 Verify single event with single SFTP 1MB file from event poll to published file.
+Verify single event with single 1MB HTTP file. From event poll to published file
+    [TAGS]                         DFC_FUNCTIONAL_20
+    [Documentation]                Verify single event with single HTTP 1MB file from event poll to published file.
     ${cli_cmd_output}=              Run Process             ${DFC_ROOT}/../dfc-containers-clean.sh           stderr=STDOUT
-    Verify Single Event From Event Poll To Published File   1    --tc100    SFTP
+    Verify Single Event From Event Poll To Published File   1    --tc300    HTTP
 
 
-Verify single event with single 5MB SFTP file. From event poll to published file
-    [TAGS]                          DFC_FUNCTIONAL_2
-    [Documentation]                 Verify single event with single SFTP 5MB file from event poll to published file.
-    Verify Single Event From Event Poll To Published File   5    --tc101    SFTP
+Verify single event with single 5MB HTTP file. From event poll to published file
+    [TAGS]                         DFC_FUNCTIONAL_21
+    [Documentation]                Verify single event with single HTTP 5MB file from event poll to published file.
+    Verify Single Event From Event Poll To Published File   5    --tc301    HTTP
 
 
-Verify single event with single 50MB SFTP file. From event poll to published file
-    [TAGS]                          DFC_FUNCTIONAL_3
-    [Documentation]                 Verify single event with single SFTP 50MB file from event poll to published file.
-    Verify Single Event From Event Poll To Published File   50   --tc102    SFTP
+Verify single event with single 50MB HTTP file. From event poll to published file
+    [TAGS]                         DFC_FUNCTIONAL_22
+    [Documentation]                Verify single event with single HTTP 50MB file from event poll to published file.
+    Verify Single Event From Event Poll To Published File   50   --tc302    HTTP
 
 
-######## Single file, FTPES
-Verify single event with single 1MB FTPES file. From event poll to published file
-    [TAGS]                         DFC_FUNCTIONAL_10
-    [Documentation]                Verify single event with single FTPES 1MB file from event poll to published file.
-    Verify Single Event From Event Poll To Published File   1    --tc200    FTPES
-
-Verify single event with single 5MB FTPES file. From event poll to published file
-    [TAGS]                         DFC_FUNCTIONAL_11
-    [Documentation]                Verify single event with single FTPES 5MB file from event poll to published file.
-    Verify Single Event From Event Poll To Published File   5    --tc201    FTPES
-
-Verify single event with single 50MB FTEPS file. From event poll to published file
-    [TAGS]                         DFC_FUNCTIONAL_12
-    [Documentation]                Verify single event with single FTPES 50MB file from event poll to published file.
-    Verify Single Event From Event Poll To Published File   50   --tc202    FTPES
-
 *** Keywords ***
 Verify Single Event From Event Poll To Published File
     [Documentation]                 Keyword to verify single event with file with given parameters.
-    [Arguments]                     ${file_size_in_mb}    ${mr_tc}    ${ftp_type}
+    [Arguments]                     ${file_size_in_mb}    ${mr_tc}    ${http_type}
     Set Environment Variable        MR_TC                   ${mr_tc}
     Set Environment Variable        FILE_SIZE               ${file_size_in_mb}MB
-    Set Environment Variable        FTP_TYPE                ${ftp_type}
+    Set Environment Variable        HTTP_TYPE                ${http_type}
     Set Default Environment Variables
 
     ${cli_cmd_output}=              Run Process     ./simulators-start.sh    cwd=${SIMGROUP_ROOT}
@@ -95,10 +79,15 @@
     Set Environment Variable        MR_FILE_PREFIX_MAPPING  PM_MEAS_FILES:A
     Set Environment Variable        DR_REDIR_FEEDS          2:A
     Set Environment Variable        FTP_FILE_PREFIXES       A
+    Set Environment Variable        FTP_TYPE                SFTP
+    Set Environment Variable        HTTP_FILE_PREFIXES      A
     Set Environment Variable        NUM_FTPFILES            1
+    Set Environment Variable        NUM_HTTPFILES           1
     Set Environment Variable        NUM_PNFS                1
     Set Environment Variable        NUM_FTP_SERVERS         1
+    Set Environment Variable        NUM_HTTP_SERVERS        1
     Set Environment Variable        DR_FEEDS                2:A
     Set Environment Variable        DR_REDIR_SIM            drsim_redir
     Set Environment Variable        SFTP_SIMS               sftp-server0:22
     Set Environment Variable        FTPES_SIMS              ftpes-server-vsftpd0:21
+    Set Environment Variable        HTTP_SIMS               http-server0:80
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/__init__.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite/__init__.robot
similarity index 74%
rename from tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/__init__.robot
rename to tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite/__init__.robot
index dc2d837..5245d65 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/__init__.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite/__init__.robot
@@ -1,2 +1,2 @@
 *** Settings ***
-Documentation    DFC Functional test suite. Single event with single file.
+Documentation    DFC Functional test suite. Single event with single file - HTTP protocol.
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot b/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot
index 3962d4e..5594620 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot
@@ -77,15 +77,20 @@
     Set Environment Variable        MR_FILE_PREFIX_MAPPING  PM_MEAS_FILES:A
     Set Environment Variable        DR_REDIR_FEEDS          2:A
     Set Environment Variable        FTP_FILE_PREFIXES       A
+    Set Environment Variable        HTTP_FILE_PREFIXES      A
     Set Environment Variable        NUM_FTPFILES            1
+    Set Environment Variable        NUM_HTTPFILES           1
     Set Environment Variable        NUM_PNFS                1
     Set Environment Variable        FILE_SIZE               1MB
     Set Environment Variable        FTP_TYPE                SFTP
+    Set Environment Variable        HTTP_TYPE               HTTP
     Set Environment Variable        NUM_FTP_SERVERS         1
+    Set Environment Variable        NUM_HTTP_SERVERS        1
     Set Environment Variable        DR_FEEDS                2:A
     Set Environment Variable        DR_REDIR_SIM            drsim_redir
     Set Environment Variable        SFTP_SIMS               sftp-server0:22
-    Set Environment Variable        FTPS_SIMS               ftpes-server-vsftpd0:21
+    Set Environment Variable        FTPES_SIMS              ftpes-server-vsftpd0:21
+    Set Environment Variable        HTTP_SIMS               http-server0:80
 
     ${cli_cmd_output}=              Run Process     ./simulators-start.sh    cwd=${SIMGROUP_ROOT}
     Log To Console                  Simulator-start: