diff --git a/CMakeLists.txt b/CMakeLists.txt
index aad3bcf8..ae0b432d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ foreach ( infile ${ER7_UTIL_HEADERS} )
     file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/trick_source/er7_utils/${infile} DESTINATION "${CMAKE_BINARY_DIR}/include/er7_utils/${dir}")
 endforeach(infile)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/share/trick/makefiles/config_user.mk.in ${CMAKE_BINARY_DIR}/share/trick/makefiles/config_user.mk)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/share/trick/makefiles/config_user_cmake.mk.in ${CMAKE_BINARY_DIR}/share/trick/makefiles/config_user.mk)
 
 ###############################################################
 # mongoose lib
diff --git a/share/trick/makefiles/Makefile.common b/share/trick/makefiles/Makefile.common
index 35623d10..ffa11edf 100644
--- a/share/trick/makefiles/Makefile.common
+++ b/share/trick/makefiles/Makefile.common
@@ -110,6 +110,16 @@ ifeq ($(USE_ER7_UTILS),ON)
         TRICK_SYSTEM_CXXFLAGS += -DUSE_ER7_UTILS_CHECKPOINTHELPER
    endif
 endif
+# older test, remove when cmake is only build system
+ifeq ($(USE_ER7_UTILS), 1)
+    ER7_UTILS_HOME := $(TRICK_HOME)/trick_source/er7_utils
+    TRICK_SYSTEM_CXXFLAGS += -DUSE_ER7_UTILS_INTEGRATORS
+    TRICK_LIBS += -ler7_utils
+    ifneq ($(wildcard ${ER7_UTILS_HOME}/CheckpointHelper),)
+        USE_ER7_UTILS_CHECKPOINTHELPER = 1
+        TRICK_SYSTEM_CXXFLAGS += -DUSE_ER7_UTILS_CHECKPOINTHELPER
+   endif
+endif
 
 ifeq ($(TRICK_FORCE_32BIT),ON)
    TRICK_ICGFLAGS += -m32
@@ -117,6 +127,13 @@ ifeq ($(TRICK_FORCE_32BIT),ON)
    TRICK_SYSTEM_LDFLAGS  += -m32
    LD_PARTIAL            += -melf_i386
 endif
+# older test, remove when cmake is only build system
+ifeq ($(TRICK_FORCE_32BIT), 1)
+   TRICK_ICGFLAGS += -m32
+   TRICK_SYSTEM_CXXFLAGS += -m32
+   TRICK_SYSTEM_LDFLAGS  += -m32
+   LD_PARTIAL            += -melf_i386
+endif
 
 IS_CC_CLANG = $(shell ${TRICK_CXX} -xc /dev/null -dM -E | grep -c __clang__)
 ifeq ($(IS_CC_CLANG), 1)
diff --git a/share/trick/makefiles/config_user.mk.in b/share/trick/makefiles/config_user_cmake.mk.in
similarity index 100%
rename from share/trick/makefiles/config_user.mk.in
rename to share/trick/makefiles/config_user_cmake.mk.in