diff --git a/tests/functional/Makefile b/tests/functional/Makefile
index 16d28b4..a10d65f 100644
--- a/tests/functional/Makefile
+++ b/tests/functional/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright(c) 2019-2021 Intel Corporation
+# Copyright(c) 2019-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -8,13 +8,14 @@ OCFDIR=$(PWD)/../../
 ADAPTERDIR=$(PWD)/pyocf
 SRCDIR=$(ADAPTERDIR)/ocf/src
 INCDIR=$(ADAPTERDIR)/ocf/include
-WRAPDIR=$(ADAPTERDIR)/wrappers
+WRAPDIR=$(ADAPTERDIR)/c/wrappers
+HELPDIR=$(ADAPTERDIR)/c/helpers
 
 CC=gcc
 CFLAGS=-g -Wall -I$(INCDIR) -I$(SRCDIR)/ocf/env
 LDFLAGS=-pthread -lz
 
-SRC=$(shell find $(SRCDIR) $(WRAPDIR) -name \*.c)
+SRC=$(shell find $(SRCDIR) $(WRAPDIR) $(HELPDIR) -name \*.c)
 OBJS=$(patsubst %.c, %.o, $(SRC))
 OCFLIB=$(ADAPTERDIR)/libocf.so
 
diff --git a/tests/functional/pyocf/wrappers/ocf_core_wrappers.c b/tests/functional/pyocf/c/wrappers/ocf_core_wrappers.c
similarity index 100%
rename from tests/functional/pyocf/wrappers/ocf_core_wrappers.c
rename to tests/functional/pyocf/c/wrappers/ocf_core_wrappers.c
diff --git a/tests/functional/pyocf/wrappers/ocf_io_wrappers.c b/tests/functional/pyocf/c/wrappers/ocf_io_wrappers.c
similarity index 100%
rename from tests/functional/pyocf/wrappers/ocf_io_wrappers.c
rename to tests/functional/pyocf/c/wrappers/ocf_io_wrappers.c
diff --git a/tests/functional/pyocf/wrappers/ocf_logger_wrappers.c b/tests/functional/pyocf/c/wrappers/ocf_logger_wrappers.c
similarity index 100%
rename from tests/functional/pyocf/wrappers/ocf_logger_wrappers.c
rename to tests/functional/pyocf/c/wrappers/ocf_logger_wrappers.c
diff --git a/tests/functional/pyocf/wrappers/ocf_mngt_wrappers.c b/tests/functional/pyocf/c/wrappers/ocf_mngt_wrappers.c
similarity index 100%
rename from tests/functional/pyocf/wrappers/ocf_mngt_wrappers.c
rename to tests/functional/pyocf/c/wrappers/ocf_mngt_wrappers.c
diff --git a/tests/functional/pyocf/wrappers/ocf_volume_wrappers.c b/tests/functional/pyocf/c/wrappers/ocf_volume_wrappers.c
similarity index 100%
rename from tests/functional/pyocf/wrappers/ocf_volume_wrappers.c
rename to tests/functional/pyocf/c/wrappers/ocf_volume_wrappers.c