diff --git a/examples/energest-demo/Makefile b/examples/energest-demo/Makefile
index bd7fac2f5..3c4403234 100644
--- a/examples/energest-demo/Makefile
+++ b/examples/energest-demo/Makefile
@@ -18,9 +18,14 @@ zip: all jar
 
 all: burn-nodeids javaapp energest-demo.ihex
 
+upload:	energest-demo.upload
+
 burn-nodeids:
 	(cd nodeid; $(MAKE))
 
+rundemo: zip
+	cd contiki-energest-demo; make rundemo
+
 jar:
 	ant jar
 
@@ -47,9 +52,4 @@ CFLAGS += -DRF_CHANNEL=20
 endif
 
 
-%.upload: %.ihex
-	cp $< ../testbed-server/image.ihex
-	(cd ../testbed-server; make upload)
-
-
 include $(CONTIKI)/Makefile.include