diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index a367fd421..d00b0e411 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -42,7 +42,8 @@ TARGET_CORE_SRC = \
 	image.c \
 	breakpoints.c \
 	target.c \
-	target_request.c
+	target_request.c \
+	testee.c
 
 ARMV4_5_SRC = \
 	armv4_5.c \
diff --git a/src/target/target.c b/src/target/target.c
index 4a9095a67..97a93c061 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -65,6 +65,7 @@ extern struct target_type cortexa8_target;
 extern struct target_type arm11_target;
 extern struct target_type mips_m4k_target;
 extern struct target_type avr_target;
+extern struct target_type testee_target;
 
 struct target_type *target_types[] =
 {
@@ -83,6 +84,7 @@ struct target_type *target_types[] =
 	&arm11_target,
 	&mips_m4k_target,
 	&avr_target,
+	&testee_target,
 	NULL,
 };
 
diff --git a/src/target/testee.c b/src/target/testee.c
new file mode 100644
index 000000000..ca3d56e32
--- /dev/null
+++ b/src/target/testee.c
@@ -0,0 +1,48 @@
+/***************************************************************************
+ *   Copyright (C) 2009 Zachary T Welch <zw@superlucidity.net>             *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program 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 General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "target.h"
+#include "target_type.h"
+#include "log.h"
+#include "../hello.h"
+
+static const struct command_registration testee_command_handlers[] = {
+	{
+		.name = "testee",
+		.mode = COMMAND_ANY,
+		.help = "testee target commands",
+
+		.chain = hello_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
+static int testee_init(struct command_context *cmd_ctx, struct target *target)
+{
+	return ERROR_OK;
+}
+
+struct target_type testee_target = {
+	.name = "testee",
+	.init_target = &testee_init,
+	.commands = testee_command_handlers,
+};