diff --git a/contrib/10.readline/nitro.mk b/contrib/10.readline/nitro.mk
index 280d6f52..51d296ea 100644
--- a/contrib/10.readline/nitro.mk
+++ b/contrib/10.readline/nitro.mk
@@ -3,8 +3,14 @@ libedit_exists := $(shell pkg-config libedit --exists; echo $$?)
 ifeq ($(libedit_exists),0)
   CONTRIB_SRCS += contrib/10.readline/src/readline.c
   CONTRIB_INITS += readline
+  CONTRIB_TESTS += test-readline
   LDFLAGS += `pkg-config libedit --libs`
 endif
 
 contrib/src/readline.o: contrib/src/readline.c
 	$(CC) $(CFLAGS) -o $@ $< `pkg-config libedit --cflags`
+
+test-readline: bin/picrin
+	for test in `ls contrib/10.readline/t/*.scm`; do \
+	  bin/picrin $$test; \
+	done
diff --git a/contrib/10.regexp/CMakeLists.txt b/contrib/10.regexp/CMakeLists.txt
deleted file mode 100644
index c13c76d3..00000000
--- a/contrib/10.regexp/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# regex
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/contrib/10.regexp/cmake/")
-
-find_package(REGEX)
-
-if (REGEX_FOUND)
-  add_definitions(${REGEX_DEFINITIONS})
-  include_directories(${REGEX_INCLUDE_DIR})
-
-  file(GLOB PICRIN_REGEX_SOURCES ${PROJECT_SOURCE_DIR}/contrib/10.regexp/src/*.c)
-
-  list(APPEND PICRIN_CONTRIB_INITS regexp)
-  list(APPEND PICRIN_CONTRIB_LIBRARIES ${REGEX_LIBRARIES})
-  list(APPEND PICRIN_CONTRIB_SOURCES ${PICRIN_REGEX_SOURCES})
-  add_custom_target(test-regexp for test in ${PROJECT_SOURCE_DIR}/contrib/10.regexp/t/*.scm \; do bin/picrin "$$test" \; done DEPENDS repl)
-  set(CONTRIB_TESTS ${CONTRIB_TESTS} test-regexp)
-endif()
diff --git a/contrib/10.regexp/cmake/FindREGEX.cmake b/contrib/10.regexp/cmake/FindREGEX.cmake
deleted file mode 100644
index f7b88113..00000000
--- a/contrib/10.regexp/cmake/FindREGEX.cmake
+++ /dev/null
@@ -1,82 +0,0 @@
-#                                               -*- cmake -*-
-#
-#  FindRegex.cmake: Try to find Regex
-#
-#  Copyright (C) 2014-     Yuichi Nishiwaki
-#  Copyright (C) 2005-2013 EDF-EADS-Phimeca
-#
-#  This library is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  along with this library.  If not, see <http://www.gnu.org/licenses/>.
-#
-#  @author dutka
-#  @date   2010-02-04 16:44:49 +0100 (Thu, 04 Feb 2010)
-#
-# - Try to find Regex
-# Once done this will define
-#
-#  REGEX_FOUND - System has Regex
-#  REGEX_INCLUDE_DIR - The Regex include directory
-#  REGEX_LIBRARIES - The libraries needed to use Regex
-#  REGEX_DEFINITIONS - Compiler switches required for using Regex
-#
-#
-#  ChangeLogs:
-#
-#  2014/05/07 - Yuichi Nishiwaki
-#    On Mac, it finds /System/Library/Frameworks/Ruby.framework/Headers/regex.h,
-#   which was a part of superold version of glibc when POSIX standard didn't exist.
-#   To avoid this behavior, we call find_path twice, searching /usr/include and
-#   /usr/local/include first and if nothing was found then searching $PATH in the
-#   second stage.
-#
-
-IF (REGEX_INCLUDE_DIR AND REGEX_LIBRARIES)
-   # in cache already
-   SET(Regex_FIND_QUIETLY TRUE)
-ENDIF (REGEX_INCLUDE_DIR AND REGEX_LIBRARIES)
-
-#IF (NOT WIN32)
-#   # use pkg-config to get the directories and then use these values
-#   # in the FIND_PATH() and FIND_LIBRARY() calls
-#   FIND_PACKAGE(PkgConfig)
-#   PKG_CHECK_MODULES(PC_REGEX regex)
-#   SET(REGEX_DEFINITIONS ${PC_REGEX_CFLAGS_OTHER})
-#ENDIF (NOT WIN32)
-
-FIND_PATH(REGEX_INCLUDE_DIR regex.h
-  PATHS /usr/include /usr/local/include
-  NO_DEFAULT_PATH
-  )
-
-IF (NOT REGEX_INCLUDE_DIR)
-  FIND_PATH(REGEX_INCLUDE_DIR regex.h
-    HINTS
-    ${REGEX_INCLUDEDIR}
-    ${PC_LIBXML_INCLUDE_DIRS}
-    PATH_SUFFIXES regex
-    )
-ENDIF()
-
-FIND_LIBRARY(REGEX_LIBRARIES NAMES c regex
-   HINTS
-   ${PC_REGEX_LIBDIR}
-   ${PC_REGEX_LIBRARY_DIRS}
-   )
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-# handle the QUIETLY and REQUIRED arguments and set REGEX_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Regex DEFAULT_MSG REGEX_LIBRARIES REGEX_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(REGEX_INCLUDE_DIR REGEX_LIBRARIES)
diff --git a/contrib/10.regexp/nitro.mk b/contrib/10.regexp/nitro.mk
new file mode 100644
index 00000000..9fe45e2f
--- /dev/null
+++ b/contrib/10.regexp/nitro.mk
@@ -0,0 +1,8 @@
+CONTRIB_SRCS += contrib/10.regexp/src/regexp.c
+CONTRIB_INITS += regexp
+CONTRIB_TESTS += test-regexp
+
+test-regexp: bin/picrin
+	for test in `ls contrib/10.regexp/t/*.scm`; do \
+	  bin/picrin $$test; \
+	done